Merge from trunk.

[gnu-emacs] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index 6039a54c559bfc344a2c99b8f5a0a43f8e617e6d..9e8aedfd36b23bc0891138fc59361d934e7ff119 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2011-07-29  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * Makefile.in (gl-stamp): move-if-change now in build-aux (Bug#9169).
+
+2011-07-28  Paul Eggert  <eggert@cs.ucla.edu>
+
        * image.c (check_image_size): Use 1024x1024 if unknown frame (Bug#9189).
        This is needed if max-image-size is a floating-point number.