Merge branch 'nikitakit_smoothbline' into nikitakit_ducks
authorNikita Kitaev <nikitakit@gmail.com>
Sat, 28 Nov 2009 19:35:02 +0000 (11:35 -0800)
committerNikita Kitaev <nikitakit@gmail.com>
Sat, 28 Nov 2009 19:35:02 +0000 (11:35 -0800)
commitc8dfc1fcfebdcc765fac4de28731a783b6099c35
tree9a8cf5229e8d63de7cbe91ca5fcba12aa44f3053
parent57cd3e7107bd9d70377782f62b2af0f0f0c9ebbf
parente247b19b3926ff72ed36b4b1172abf00099558e4
Merge branch 'nikitakit_smoothbline' into nikitakit_ducks

Conflicts:
synfig-core/po/fr.po
synfig-core/po/ru.po
synfig-studio/po/es.po
synfig-studio/po/fr.po
synfig-studio/po/ru.po
synfig-studio/src/gtkmm/duckmatic.cpp
synfig-studio/src/gtkmm/canvasview.cpp