Merge branch 'nikitakit_transform'

diff --git a/synfig-studio/src/gtkmm/about.cpp b/synfig-studio/src/gtkmm/about.cpp
index 1d8c065..ef8404d 100644 (file)
--- a/synfig-studio/src/gtkmm/about.cpp
+++ b/synfig-studio/src/gtkmm/about.cpp
@@ -137,7 +137,7 @@ About::About()
        authors.push_back("");
        authors.push_back("Adrian Winchell (SnapSilverlight)");
        authors.push_back("Andreas Jochens");
-       authors.puch_back("Brendon Higgins");
+       authors.push_back("Brendon Higgins");
        authors.push_back("Carlos López González (genete)");
        authors.push_back("Carlos A. Sosa Navarro");
        authors.push_back("Chris Moore (dooglus)");

diff --git a/synfig-studio/src/gtkmm/dockmanager.cpp b/synfig-studio/src/gtkmm/dockmanager.cpp
index a7f4b27..ed30a26 100644 (file)
--- a/synfig-studio/src/gtkmm/dockmanager.cpp
+++ b/synfig-studio/src/gtkmm/dockmanager.cpp
@@ -162,7 +162,7 @@ public:
                                int x,y;
                                if(!strscanf(value,"%d %d",&x, &y))
                                        return false;
-                               synfig::info("dock_manager. move to: %d, %d", x,y);
+                               //synfig::info("dock_manager. move to: %d, %d", x,y);
                                dock_dialog.move(x,y);
                                return true;
                        }
@@ -171,7 +171,7 @@ public:
                                int x,y;
                                if(!strscanf(value,"%d %d",&x, &y))
                                        return false;
-                               synfig::info("dock_manager. size to: %d, %d", x,y);
+                               //synfig::info("dock_manager. size to: %d, %d", x,y);
                                dock_dialog.set_default_size(x,y);
                                dock_dialog.resize(x,y);
                                return true;