From: Stefano Lattarini Date: Tue, 20 Sep 2011 18:27:23 +0000 (+0200) Subject: fix: cleanup NEWS after botched merges X-Git-Tag: ng-0.5a~117 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9bb2b6f474d6a1e1371c82323726449ef2daac02;p=thirdparty%2Fautomake.git fix: cleanup NEWS after botched merges --- diff --git a/ChangeLog b/ChangeLog index 01388cc0b..0fdb29515 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-09-20 Stefano Lattarini + + * NEWS: Cleanup after botched merges. + 2011-09-20 Stefano Lattarini * NEWS: Fix typo. diff --git a/NEWS b/NEWS index 1123ec131..9f07e5fc7 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.