Merge from gnulib.

[bpt/emacs.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index ead1709..a3c1741 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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.