Merge from gnulib.

[bpt/emacs.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index d2224d0..d56d74b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-02  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Merge from gnulib, incorporating copyright-date changes and:
+       2012-12-31 dup2: work around cygwin bug
+
 2012-12-30  Jan Djärv  <jan.h.d@swipnet.se>
 
        * configure.ac: Check for GtkHandlebox.