gimp r24150 - in branches/gimp-2-4: . app/core

[neo svn gnome org]

Author: neo
Date: 2007-11-13 19:10:05 +0000 (Tue, 13 Nov 2007)
New Revision: 24150
ViewCVS link: http://svn.gnome.org/viewcvs/gimp?rev=24150&view=rev

Modified:
   branches/gimp-2-4/ChangeLog
   branches/gimp-2-4/app/core/gimpimage-merge.c
Log:
2007-11-13  Sven Neumann  <sven gimp org>

	Merged from trunk:

	* app/core/gimpimage-merge.c (gimp_image_merge_layers): when we
	encounter an unsupported merge operation (merging an opaque
	indexed layer onto an indexed layer with alpha channel), then 
add
	an alpha channel and try again. Fixes bug #496437.