Merge from trunk.

1 files changed, 9 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 86a352c4cf0..a6d4144a013 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2012-04-10  Paul Eggert  <eggert@cs.ucla.edu>
+2012-04-14  Paul Eggert  <eggert@cs.ucla.edu>
 
         configure: new option --enable-gcc-warnings (Bug#11207)
         I have been using this change for many months in my private copy
@@ -15,6 +15,14 @@
         * lib/Makefile.am (AM_CFLAGS): New macro.
         * m4/manywarnings.m4, m4/warnings.m4: New files, from gnulib.
 
+2012-04-12  Ken Brown  <kbrown@cornell.edu>
+
+        * configure.in: Warn that Cygwin 1.5 is unsupported.  (Bug#10398)
+
+2012-04-11  Glenn Morris  <rgm@gnu.org>
+
+        * configure.in (GNUSTEP_CFLAGS): Rename from C_SWITCH_X_SYSTEM.
+
 2012-04-10  Glenn Morris  <rgm@gnu.org>
 
         * configure.in: Conditionally generate admin/unidata/Makefile.