Merge branch 'master' into nikitakit_restructure
authorNikita Kitaev <nikitakit@gmail.com>
Mon, 31 May 2010 04:18:19 +0000 (21:18 -0700)
committerNikita Kitaev <nikitakit@gmail.com>
Mon, 31 May 2010 04:18:19 +0000 (21:18 -0700)
commitdb91521de71f46f2debb4b3ef1edfe351aea3b2d
treebca40b997c4ee9a2c034b9395e7eba014a76f6c7
parent89d52f369dc65c21e43741333aa0054efefeb817
parent60625faec2a962c4c9de782c43bfe51b494547c3
Merge branch 'master' into nikitakit_restructure
17 files changed:
synfig-studio/configure.ac
synfig-studio/src/gui/app.cpp
synfig-studio/src/gui/app.h
synfig-studio/src/gui/asyncrenderer.cpp
synfig-studio/src/gui/dialogs/about.cpp
synfig-studio/src/gui/dialogs/dialog_targetparam.cpp
synfig-studio/src/gui/dialogs/dialog_targetparam.h
synfig-studio/src/gui/docks/dockmanager.cpp
synfig-studio/src/gui/docks/dockmanager.h
synfig-studio/src/gui/duck.cpp
synfig-studio/src/gui/iconcontroller.cpp
synfig-studio/src/gui/render.cpp
synfig-studio/src/gui/render.h
synfig-studio/src/gui/splash.cpp
synfig-studio/src/gui/states/state_mirror.cpp
synfig-studio/src/gui/states/state_normal.cpp
synfig-studio/src/gui/toolbox.cpp