Merge from trunk.

[bpt/emacs.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index f760b7b..ab2bf75 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2011-09-03  Paul Eggert  <eggert@cs.ucla.edu>
+2011-09-04  Paul Eggert  <eggert@cs.ucla.edu>
 
        Merge from gnulib, using build-aux to remove clutter (Bug#9169).
        * autogen/README: Update destination list.
@@ -32,6 +32,10 @@
        'configure'.
        * make-dist: Adjust to new build-aux and build-aux/snippit dirs.
 
+2011-09-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * configure.in (snprintf): New check.
+
 2011-08-30  Paul Eggert  <eggert@cs.ucla.edu>
 
        * configure.in (opsys): Change pattern to *-*-linux*