1 files changed, 8 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 01569db30e6..f8b12fafca0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2014-05-06  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * image.c: Do not use libpng if HAVE_NS, as NS does its own thing.
+        [HAVE_NS]: Do not include png.h.
+        (x_query_frame_background_color): New function.
+        (png_load_body, imagemagick_load_image, svg_load_image): Use it.
+        (png_load_body): Coalesce duplicate code.
+
 2014-05-04  Paul Eggert  <eggert@cs.ucla.edu>
 
         Consult libpng-config more consistently (Bug#17339).