Merge from emacs-23 branch

[gnu-emacs] / test / ChangeLog

diff --git a/test/ChangeLog b/test/ChangeLog
index da85fc4a1bfe18dcd2225768df6b3b86d0d7427f..00b63ef388601c0e9acb080a1196d35145327611 100644 (file)
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -26,8 +26,20 @@
        * cedet/tests/testdoublens.cpp:
        * cedet/tests/testdoublens.hpp: Add copyright header.
 
-       * cedet/semantic-tests.el (semanticdb-test-gnu-global): Remove
-       reference to deleted files.
+       * cedet/semantic-tests.el (semanticdb-test-gnu-global):
+       Remove reference to deleted files.
+
+2010-03-30  Juri Linkov  <juri@jurta.org>
+
+       * occur-testsuite.el (occur-tests): Add tests for context lines.
+
+2010-03-23  Juri Linkov  <juri@jurta.org>
+
+       * occur-testsuite.el: New file.
+
+2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
+
+       * Branch for 23.2.
 
 2010-02-19  Ulf Jasper  <ulf.jasper@web.de>