Merge branch 'master' into genete_core_review
authorCarlos Lopez <genetita@gmail.com>
Tue, 17 Aug 2010 13:25:09 +0000 (15:25 +0200)
committerCarlos Lopez <genetita@gmail.com>
Tue, 17 Aug 2010 13:25:09 +0000 (15:25 +0200)
commit2aa82e84160499903d3e7f85a7770ffe3d04ddb2
tree8c867f3ff567857081af7cd72078c7b9d026ac31
parentb2ebf2972d37f1962587139b27f735aea54bdea3
parentd0f8d51a0f3c779fcd3795eba046e97ceb51f075
Merge branch 'master' into genete_core_review
synfig-core/src/synfig/color.h