Fix ChangeLog after merge

diff --git a/ChangeLog b/ChangeLog
index f28a8b94807042bd420bac096ac28e23e8d96793..010872dd6200dfd84e43d290b59e55c0571f0e41 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,45 +1,3 @@
-2010-09-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
-
-       Tests defs: remove variable $testaclocaldir.
-       * tests/defs.in ($testaclocaldir): Removed.
-       * tests/aclocal.test: Use `$top_testsrcdir/m4' directly, not
-       `$testaclocaldir'.
-
-       Tests defs: $srcdir and $top_srcdir renaming.
-       * tests/defs.in ($srcdir): Remove, define $testsrcdir directly.
-       * tests/Makefile.am ($(parallel_tests)): Generation of derived
-       tests updated.
-
-       Tests defs: new variable $top_testsrcdir.
-       * tests/defs.in ($top_testsrcdir): Define unconditionally
-       to @abs_top_srcdir@.  Use it throughout.
-       * tests/ar-lib.test: Use `$top_testsrcdir' instead of
-       `$testsrcdir/..'.
-       * tests/auxdir.test: Likewise.
-       * tests/compile.test: Likewise.
-       * tests/compile2.test: Likewise.
-       * tests/compile3.test: Likewise.
-       * tests/compile5.test: Likewise.
-       * tests/mdate6.test: Likewise.
-       * tests/mkinst3.test: Likewise.
-       * tests/multlib.test: Likewise.
-       * tests/txinfo22.test: Likewise.
-
-       Tests defs: $srcdir is unconditionally substituted.
-       * tests/defs.in ($srcdir): Define unconditionally to @abs_srcdir@.
-       Remove code for $srcdir normalization, which is now useless.
-
-2010-09-02  Stefano Lattarini  <stefano.lattarini@gmail.com>
-
-       Tests defs: make spacing more consistent.
-       * tests/defs.in: Make spacing more consistent in indentation.
-       Especially, indent using only spaces, not tabs.  Also, move
-       a comment to a better position.
-
-       Improve code for requiring libtool and gettext in tests.
-       * tests/defs.in: Stricter (and more correct) detection of wheter
-       libtool, libtoolize and/or gettext are in $required.
-
 2010-11-03  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
        Overhauled and modularized tests in `instspc.test'.
@@ -436,6 +394,49 @@
        Posix 2008 requires make to set errexit.
        * lib/am/check.am: Update comment.
 
+2010-09-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       Tests defs: remove variable $testaclocaldir.
+       * tests/defs.in ($testaclocaldir): Removed.
+       * tests/aclocal.test: Use `$top_testsrcdir/m4' directly, not
+       `$testaclocaldir'.
+
+       Tests defs: $srcdir and $top_srcdir renaming.
+       * tests/defs.in ($srcdir): Remove, define $testsrcdir directly.
+       * tests/Makefile.am ($(parallel_tests)): Generation of derived
+       tests updated.
+
+       Tests defs: new variable $top_testsrcdir.
+       * tests/defs.in ($top_testsrcdir): Define unconditionally
+       to @abs_top_srcdir@.  Use it throughout.
+       * tests/ar-lib.test: Use `$top_testsrcdir' instead of
+       `$testsrcdir/..'.
+       * tests/auxdir.test: Likewise.
+       * tests/compile.test: Likewise.
+       * tests/compile2.test: Likewise.
+       * tests/compile3.test: Likewise.
+       * tests/compile5.test: Likewise.
+       * tests/mdate6.test: Likewise.
+       * tests/mkinst3.test: Likewise.
+       * tests/multlib.test: Likewise.
+       * tests/txinfo22.test: Likewise.
+
+       Tests defs: $srcdir is unconditionally substituted.
+       * tests/defs.in ($srcdir): Define unconditionally to @abs_srcdir@.
+       Remove code for $srcdir normalization, which is now useless.
+
+2010-09-02  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       Tests defs: make spacing more consistent.
+       * tests/defs.in: Make spacing more consistent in indentation.
+       Especially, indent using only spaces, not tabs.  Also, move
+       a comment to a better position.
+
+       Improve code for requiring libtool and gettext in tests.
+       * tests/defs.in: Stricter (and more correct) detection of wheter
+       libtool, libtoolize and/or gettext are in $required.
+
+
 2010-08-27  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
        Fix bug in test missing6.test.