Merge from trunk.

[gnu-emacs] / oldXMenu / ChangeLog

diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog
index b40b5ca70841369b36fdf2a36851145ca991fe88..b1eb200416b1bfa0d5b22175f4605c59763c89ee 100644 (file)
--- a/oldXMenu/ChangeLog
+++ b/oldXMenu/ChangeLog
@@ -1,3 +1,15 @@
+2012-04-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+       configure: new option --enable-gcc-warnings (Bug#11207)
+       * Makefile.in (C_WARNINGS_SWITCH): Remove.
+       (WARN_CFLAGS, WERROR_CFLAGS): New macros.
+       (ALL_CFLAGS): Use new macros rather than old.
+
+2012-04-11  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in (C_SWITCH_X_SYSTEM): Remove.
+       (ALL_CFLAGS): Remove C_SWITCH_X_SYSTEM.
+
 2011-04-16  Paul Eggert  <eggert@cs.ucla.edu>
 
        Static checks with GCC 4.6.0 and non-default toolkits.
@@ -167,7 +179,7 @@
 2007-02-25  Glenn Morris  <rgm@gnu.org>
 
        * XCrAssoc.c, XDelAssoc.c, XDestAssoc.c, XLookAssoc.c:
-       * XMakeAssoc.c: Remove license text in favour of including
+       * XMakeAssoc.c: Remove license text in favor of including
        copyright.h, as was done in original X11 source.
 
 2004-12-27  Jan Djärv  <jan.h.d@swipnet.se>
@@ -615,7 +627,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1993-1999, 2001-2011  Free Software Foundation, Inc.
+  Copyright (C) 1993-1999, 2001-2012 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.