* fns.c (Fputhash): Document return value.

[bpt/emacs.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 731d810..020991e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,16 @@
+2011-06-06  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Merge from gnulib.
+       * lib/careadlinkat.c, lib/careadlinkat.h, m4/gnulib-common.m4: Merge.
+
+2011-06-02  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * lib/allocator.h, lib/careadlinkat.c: Merge from gnulib.
+
 2011-05-30  Paul Eggert  <eggert@cs.ucla.edu>
 
        Use 'inline', not 'INLINE'.
-       * configure.in, autogen/config.in (INLINE): Remove.
+       * configure.in (INLINE): Remove.
 
 2011-05-29  Paul Eggert  <eggert@cs.ucla.edu>