Merge from gnulib.

[bpt/emacs.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 217e1d3..d04d7e2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-08  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * lib/getopt.c, lib/unistd.in.h, m4/getopt.m4: Merge from gnulib.
+
 2011-07-07  Andreas Schwab  <schwab@linux-m68k.org>
 
        * configure.in (maintainer-mode): Reflect default in help string.