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)
commitb603ea1c4a4bf9749ed922c5f79af37c91132edf
treea3781072b1b345661554f60943212c35bda81066
parent633fda4aace074fdc72bdf7a2eae46a1b721dda1
parent6f2a0d4211feb1e075688ccd754bf35078c8cc3d
Merge branch 'nikitakit_master'
synfig-studio/src/gui/duckmatic.cpp