Merge branch 'zelgadis_master'. Resolved conflicts manually
authorCarlos Lopez <genetita@gmail.com>
Tue, 12 Oct 2010 16:09:50 +0000 (18:09 +0200)
committerCarlos Lopez <genetita@gmail.com>
Tue, 12 Oct 2010 16:09:50 +0000 (18:09 +0200)
commit25328bfe03255756921ee3a8aba2a6e37a7955fe
tree59849b1863f0474c76296da50acf958e6bcdc092
parent4528a04e3515f6831710848439377eb32344250a
parentb6831c4b32fb612908af87de6c01723c6a03e56f
Merge branch 'zelgadis_master'. Resolved conflicts manually
synfig-studio/images/Makefile.am