finalise NEWS.stable

[gnulib.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index b2624cd..6d3e808 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+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'.
+       * gnulib-tool (func_add_file, func_update_file, func_import): Use
+       "cmp -s", not "cmp > /dev/null".
+
 2012-03-23  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
        gnulib-tool: fix imprecise comments w.r.t. an automake bug
@@ -4390,12 +4409,15 @@
        (main): Skip the test if sethostname() fails with EPERM. On Windows
        platforms, don't check the result of gethostname().
 
+>>>>>>> snapshot-start
 2011-12-04  Bruno Haible  <bruno@clisp.org>
            Jim Meyering  <meyering@redhat.com>
 
        tests: Avoid spurious error message on platforms without mktemp program.
        * tests/init.sh (mktempd_): Run mktemp in a subcommand.
 
+<<<<<<< HEAD
+=======
 2011-12-04  Bruno Haible  <bruno@clisp.org>
 
        sethostname: Fix documentation.
@@ -4498,6 +4520,7 @@
        * m4/gethostname.m4 (gl_PREREQ_HOST_NAME_MAX): Make this a separate
        macro so it can be used by the pending sethostname module.
 
+>>>>>>> snapshot-start
 2011-12-03  Bruno Haible  <bruno@clisp.org>
 
        Fix module descriptions syntax.