1 files changed, 11 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index dabe3b3d7db..cf2d0dc250c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2013-01-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Merge from gnulib, incorporating:
+        2013-01-16 largefile: port better to Mac OS X 10.5
+        2013-01-15 stdint: fix build with Android's Bionic fox x86
+
+2013-01-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * configure.ac: Document that --enable-gcc-warnings emits errors.
+        (Bug#13448)
+
 2013-01-13  Glenn Morris  <rgm@gnu.org>
 
         * make-dist: Add options for xz compression and no compression.