1 files changed, 9 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 99d5c667f76..a3c17418bd7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-05-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * lib/intprops.h, lib/stdint.in.h, m4/mktime.m4, m4/readlink.m4:
+        Merge from gnulib.
+
+2011-05-21  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * Makefile.in (AUTOMAKE_INPUTS): Add $(srcdir)/lib/gnulib.mk.
+
 2011-05-20  Eli Zaretskii  <eliz@gnu.org>
 
         * .bzrignore: Add lib/stdio.in-h, lib/stdbool.h, and lib/stdint.h.