Merge from gnulib.

[gnu-emacs] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 7a2e7769ecaa0aeda019af0f312bdb29f84ab44e..84d9987ccea68013a09bfce2991c5e47c5b586cc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-03-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Merge from gnulib, incorporating:
+       2013-02-21 putenv: port better to native Windows
+       2013-02-18 extern-inline: avoid compilation error with HP-UX cc
+       2013-02-14 putenv: fix heap corruption with mixed putenv/_putenv
+
 2013-02-28  Ken Brown  <kbrown@cornell.edu>
 
        * configure.ac (HAVE_DATA_START): Fix test.  (Bug#13818)