[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11.1-24-gb17d3f5

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=b17d3f5966d2aa6d024731c62b6eb91d5ca8175c

The branch, branch-1.11 has been updated
       via  b17d3f5966d2aa6d024731c62b6eb91d5ca8175c (commit)
      from  d717c2b1358c414cdfe07f5b16d5b569bc0e7608 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b17d3f5966d2aa6d024731c62b6eb91d5ca8175c
Author: Ralf Wildenhues <address@hidden>
Date:   Sat Feb 6 20:52:55 2010 +0100

    Merge NEWS entry correctly.
    
    * NEWS: Fix mis-merge.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog |    5 +++++
 NEWS      |   10 +++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 45950f4..a868915 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-06  Ralf Wildenhues  <address@hidden>
+
+       Merge NEWS entry correctly.
+       * NEWS: Fix mis-merge.
+
 2010-02-06  Dmitry V. Levin  <address@hidden>  (tiny change)
            Ralf Wildenhues  <address@hidden>
 
diff --git a/NEWS b/NEWS
index ec9a7aa..c9df157 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,11 @@ Bugs fixed in 1.11.1a:
 
 * Long standing bugs:
 
+  - The `silent-rules' option now also silences all compile rules if dependency
+    tracking is disabled.  Also, when `silent-rules' is not used, the output 
from
+    `make' does not contain spurious extra lines with only a backslash in them
+    any more; it now again matches that from pre-1.11 Automake.
+
   - Several scripts as well as the parallel-tests testsuite driver now
     exit with the right exit status upon receiving a signal.
 
@@ -19,11 +24,6 @@ Bugs fixed in 1.11.1:
   - The `parallel-tests' test driver works around a GNU make 3.80 bug with
     trailing white space in the test list (`TESTS = foo $(EMPTY)').
 
-  - The `silent-rules' option now also silences all compile rules if dependency
-    tracking is disabled.  Also, when `silent-rules' is not used, the output 
from
-    `make' does not contain spurious extra lines with only a backslash in them
-    any more; it now again matches that from pre-1.11 Automake.
-
 * Long standing bugs:
 
   - On Darwin 9, `pythondir' and `pyexecdir' pointed below `/Library/Python'


hooks/post-receive
-- 
GNU Automake