1 files changed, 35 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index a6d5148c777..cf2d0dc250c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,38 @@
+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.
+
+2013-01-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Enable conservative stack scanning for all architectures.
+        Suggested by Stefan Monnier in
+        <http://lists.gnu.org/archive/html/emacs-devel/2013-01/msg00183.html>.
+        * configure.ac (GC_MARK_STACK): Remove.
+
+2013-01-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * lib/getopt_.h: Remove trailing CRs that crept in.
+
+2013-01-11  Eli Zaretskii  <eliz@gnu.org>
+
+        * lib/getopt_.h: Regenerate.
+
+2013-01-10  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Merge from gnulib, incorporating:
+        2013-01-09 stdlib: port to Solaris 2.6
+
 2013-01-04  Glenn Morris  <rgm@gnu.org>
 
         * info/dir: Add htmlfontify.