Merge commit 'origin/master' into soc-2009-dynamics

This commit is contained in:
Alexia Death
2009-10-11 01:05:40 +03:00
15 changed files with 253 additions and 305 deletions

View File

@ -905,8 +905,6 @@ GIMP_CHANNEL_GET_CLASS
<SECTION>
<FILE>gimpchannel-combine</FILE>
<TITLE>GimpChannel-combine</TITLE>
gimp_channel_add_segment
gimp_channel_sub_segment
gimp_channel_combine_rect
gimp_channel_combine_ellipse
gimp_channel_combine_ellipse_rect