1 files changed, 24 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 8928b2aceeb..8a76e997905 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,29 @@
-2011-03-17  Paul Eggert  <eggert@cs.ucla.edu>
+2011-03-21  Paul Eggert  <eggert@cs.ucla.edu>
 
         * Makefile.in (GNULIB_MODULES): Add socklen.
         * configure.in: Do not check for sys/socket.h, since socklen does that.
         * m4/socklen.m4: New automatically-generated file, from gnulib.
 
+2011-03-21  Paul Eggert  <eggert@cs.ucla.edu>
+
+        fakemail: Remove dependency on ignore-value.
+        * Makefile.in (GNULIB_MODULES): Add stdio.
+        * lib/stdio.in.h, m4/stdio_h.m4: New files, automatically
+        imported from gnulib.
+        * .bzrignore: Add lib/stdio.h.
+
+2011-03-20  Glenn Morris  <rgm@gnu.org>
+
+        * autogen/: New directory, to be excluded from releases.
+        * autogen/copy_autogen, autogen/update_autogen: New scripts.
+        * autogen/README: New file.
+        * autogen/aclocal.m4, autogen/config.in, autogen/configure:
+        * autogen/Makefile.in: Add auto-updated generated files.
+        * autogen.sh: No longer a no-op, now it tests for autotools
+        and runs them as necessary.
+        * configure.in: Defaule maintainer-mode to on.
+        * aclocal.m4, configure, lib/Makefile.in: Remove files.
+
 2011-03-13  Paul Eggert  <eggert@cs.ucla.edu>
 
         Update for gnulib.
@@ -65,7 +85,7 @@
 
 2011-02-21  Christoph Scholtes  <cschol2112@gmail.com>
 
-        * lib/makefile.w32-in: ($(BLD)/md5.$(O)): Added dependency on
+        * lib/makefile.w32-in ($(BLD)/md5.$(O)): Added dependency on
         $(EMACS_ROOT)/nt/inc/stdint.h.
 
 2011-02-21  Eli Zaretskii  <eliz@gnu.org>
@@ -104,7 +124,7 @@
         way to test this so I left it alone.
         * configure: Regenerate.
 
-2011-02-20  Christoph Scholtes <cschol2112@gmail.com>
+2011-02-20  Christoph Scholtes  <cschol2112@gmail.com>
 
         * lib/makefile.w32-in ($(BLD)/md5.$(O)): New recipe, moved from
         src/makefile.w32-in.
@@ -967,7 +987,7 @@
 
 2010-06-28  Jan Djärv  <jan.h.d@swipnet.se>
 
-        * configure.in: Add --with-x-toolkit=gtk3. Remove HAVE_GTK_MULTIDISPLAY,
+        * configure.in: Add --with-x-toolkit=gtk3.  Remove HAVE_GTK_MULTIDISPLAY,
         check for gtk_file_chooser_dialog_new, and HAVE_GTK_FILE_BOTH (implied
         by minimum required Gtk+ 2.6).  Add checks for functions introduced
         in Gtk+ 2.14 or newer (bug#6505).