---
ChangeLog | 4 ++++
NEWS | 19 ++++++++-----------
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 01388cc..0fdb295 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2011-09-20 Stefano Lattarini <stefano.lattar...@gmail.com>
+ * NEWS: Cleanup after botched merges.
+
+2011-09-20 Stefano Lattarini <stefano.lattar...@gmail.com>
+
* NEWS: Fix typo.
2011-09-20 Stefano Lattarini <stefano.lattar...@gmail.com>
diff --git a/NEWS b/NEWS
index 1123ec1..9f07e5f 100644
--- a/NEWS
+++ b/NEWS
@@ -7,17 +7,6 @@ New in 1.11a:
- The deprecated options `--output-dir', `--Werror' and `--Wno-error'
have been removed.
-* New targets:
-
- - New `cscope' target to build a cscope database for the source tree.
-
- - The `--acdir' option of aclocal is deprecated, and will probably be
- removed in the next major Automake release (1.12).
-
- - The exact order in which the directories in the aclocal macro
- search path are looked up is probably going to be changed in the
- next Automake release (1.12).
-
* Changes to aclocal:
- The `--acdir' option is deprecated. Now you should use the new options
@@ -28,6 +17,14 @@ New in 1.11a:
automake internal acdir (by default ${prefix}/share/aclocal-APIVERSION)
and before the system acdir (by default ${prefix}/share/aclocal).
+ - The exact order in which the directories in the aclocal macro
+ search path are looked up is probably going to be changed in the
+ next Automake release (1.12).
+
+* New targets:
+
+ - New `cscope' target to build a cscope database for the source tree.
+
* Miscellaneous changes:
- The `dist' and `dist-all' targets now can run compressors in parallel.
--
1.7.2.3
