Merge from trunk.

1 files changed, 7 insertions, 2 deletions

diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index b7751f90a91..85b69f47d28 100644
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1,10 +1,15 @@
-2012-04-09  Paul Eggert  <eggert@cs.ucla.edu>
+2012-04-14  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-10-13  Dmitry Antipov  <dmantipov@yandex.ru>
 
         * lwlib-Xaw.c (openFont, xaw_destroy_instance): Replace free with
@@ -1763,7 +1768,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1995-1999, 2001-2012  Free Software Foundation, Inc.
+  Copyright (C) 1995-1999, 2001-2012 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.