Merge branch 'master' into nikitakit_restructure
authorNikita Kitaev <nikitakit@gmail.com>
Mon, 3 May 2010 00:55:31 +0000 (17:55 -0700)
committerNikita Kitaev <nikitakit@gmail.com>
Mon, 3 May 2010 00:55:31 +0000 (17:55 -0700)
commit077db16bb2200d3f6e936c9da3d8fe2950317eae
tree0d6b8cebab7e8099b884381f50c248a7d4c081e5
parent11aa46dab482731cd0ec514fade466fd6bf31844
parenta8e9e829fa31a982dca6a9a638e61e57fade8832
Merge branch 'master' into nikitakit_restructure
synfig-studio/src/gui/app.cpp
synfig-studio/src/gui/dialogs/about.cpp
synfig-studio/src/gui/dialogs/dialog_targetparam.cpp
synfig-studio/src/gui/iconcontroller.cpp
synfig-studio/src/gui/render.cpp
synfig-studio/src/gui/states/state_normal.cpp
synfig-studio/src/gui/toolbox.cpp