From: Kim F. Storm <storm@cua.dk>
Date: Fri, 16 Apr 2004 20:07:49 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: ttn-vms-21-2-B4~6792
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=20dc858387fa45c38052bcbc1ad4b5ec59806be4;p=emacs.git

*** empty log message ***
---

diff --git a/src/ChangeLog b/src/ChangeLog
index df9484ce3de..5364408ae30 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-17  Kim F. Storm  <storm@cua.dk>
+
+	* image.c (PNG_BG_COLOR_SHIFT): Remove.
+	(png_load): Fix calculation of transparent background color on X
+	and W32 platforms.
+
 2004-04-16  Juanma Barranquero  <lektu@terra.es>
 
 	* xdisp.c (try_scrolling): Make sure `scroll-conservatively' is