Merge from trunk.

1 files changed, 11 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index db1f1c82f35..712e4269840 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,4 @@
-2011-06-11  Paul Eggert  <eggert@cs.ucla.edu>
+2011-06-12  Paul Eggert  <eggert@cs.ucla.edu>
 
         * buffer.c (Qclone_number): Remove for now, as it's unused.
         (record_buffer, Funrecord_buffer): Rename local to avoid shadowing.
@@ -27,6 +27,16 @@
         * xterm.h: Likewise.
         (x_menu_set_in_use): Declare only if USE_GTK || USE_MOTIF.
 
+2011-06-12  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in: Update dependencies.
+        (LISP_H): Add lib/intprops.h.
+
+2011-06-11  Chong Yidong  <cyd@stupidchicken.com>
+
+        * image.c (gif_load): Add animation frame delay to the metadata.
+        (syms_of_image): Use DEFSYM.  New symbol `delay'.
+
 2011-06-11  Martin Rudalics  <rudalics@gmx.at>
 
         * window.c (delete_deletable_window): Re-add.