Merge from gnulib.

[bpt/emacs.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index c40aca0..d56d74b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,15 @@
+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.
+       Check for GtkTearoffMenuItem.
+       New enable: --enable-gtk-deprecation-warnings, default off.
+       (HAVE_GTK3): If above enable is off, add
+       -DGDK_DISABLE_DEPRECATION_WARNINGS to GTK_CFLAGS.
 
 2012-12-30  Andreas Schwab  <schwab@linux-m68k.org>
 
@@ -11863,7 +11872,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1993-1999, 2001-2012 Free Software Foundation, Inc.
+  Copyright (C) 1993-1999, 2001-2013 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.