Merge branch 'master' into genete_canvasview-revisited
authorCarlos Lopez <genetita@gmail.com>
Sat, 22 Aug 2009 07:17:25 +0000 (09:17 +0200)
committerCarlos Lopez <genetita@gmail.com>
Sat, 22 Aug 2009 07:17:25 +0000 (09:17 +0200)
commitadfc80c126f482d7ea2bac38001a2c4a7c7df88c
treeaa7bd14da4c020b763e913398a17be5a2bc3f0b0
parentd5076972c01cf5a996eb1737b2f179fd6e9abe11
parent8b0c503574977332b9dbeaf60da5078b33b02616
Merge branch 'master' into genete_canvasview-revisited
15 files changed:
synfig-studio/images/Makefile.am
synfig-studio/images/duck_angle_icon.sif
synfig-studio/images/duck_position_icon.sif
synfig-studio/images/duck_radius_icon.sif
synfig-studio/images/duck_tangent_icon.sif
synfig-studio/images/duck_vertex_icon.sif
synfig-studio/images/duck_width_icon.sif
synfig-studio/images/show_grid_icon.sif
synfig-studio/images/snap_grid_icon.sif
synfig-studio/src/gtkmm/canvasview.cpp
synfig-studio/src/gtkmm/iconcontroller.cpp
synfig-studio/src/gtkmm/resolutiondial.cpp
synfig-studio/src/gtkmm/resolutiondial.h
synfig-studio/src/gtkmm/toggleducksdial.cpp
synfig-studio/src/gtkmm/toggleducksdial.h