X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/4a621aae149e694c8a53bebcc593d51811f69444..2287ac9896c30303d7f469a3e5cb348fbbbd9e23:/ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 128d328303..d04d7e2e27 100644
--- 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.