1 files changed, 8 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 84d88fa7f1a..1dfbeae4c56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-03-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Merge from gnulib, incorporating:
+        2013-03-12 mktime: fix configure typo
+        2013-03-11 regex: port to mingw's recent addition of undeclared alarm
+        2013-03-11 putenv: avoid compilation warning on mingw
+        2013-03-11 unistd: don't prevent Tru64 Unix from using gnulib strtod.
+
 2013-03-06  Paul Eggert  <eggert@cs.ucla.edu>
 
         * configure.ac (TERM_HEADER): Remove duplicate definition (Bug#13872).