Merge branch 'nikitakit_master'
authorCarlos Lopez <genetita@gmail.com>
Fri, 17 Sep 2010 16:19:36 +0000 (18:19 +0200)
committerCarlos Lopez <genetita@gmail.com>
Fri, 17 Sep 2010 16:19:36 +0000 (18:19 +0200)
1  2 
synfig-studio/src/gui/duckmatic.cpp

Simple merge