Merge from gnulib.

[bpt/emacs.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 128d328..d04d7e2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,14 @@
 
        * 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.
+
+2011-07-07  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * configure.in: Remove reference to iris4d.h.
+
 2011-07-05  Jan Djärv  <jan.h.d@swipnet.se>
 
        * configure.in (HAVE_GCONF): Allow both HAVE_GCONF and HAVE_GSETTINGS.