finalise NEWS.stable

[gnulib.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index e2209ed..6d3e808 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
-<<<<<<< HEAD
-=======
+2012-03-31  Simon Josefsson  <simon@josefsson.org>
+
+       fflush: Fix syntax error.
+       * lib/fflush.c: Include unused-parameter.h, needed for
+       _GL_UNUSED_PARAMETER.
+       * modules/fflush (Depends-on): Add snippet/unused-parameter.
+
+2012-03-29  Eric Blake  <eblake@redhat.com>
+
+       maint.mk: fix syntax checks without exclusions
+       * top/maint.mk (_sc_search_regexp): Allow for empty variable.
+       Reported by Daniel P. Berrange.
+
 2012-03-24  Bruno Haible  <bruno@clisp.org>
 
        gnulib-tool: Avoid unintended error output from 'cmp'.