Merge changes from emacs-23 branch

[bpt/emacs.git] / test / ChangeLog

diff --git a/test/ChangeLog b/test/ChangeLog
index 3908a73..b247b88 100644 (file)
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,36 @@
+2011-03-05  Glenn Morris  <rgm@gnu.org>
+
+       * eshell.el: Move here from lisp/eshell/esh-test.el.
+
+2011-03-03  Christian Ohler  <ohler@gnu.org>
+
+       * automated/ert-tests.el (ert-test-explain-not-equal-keymaps):
+       New test.
+
+2011-02-20  Ulf Jasper  <ulf.jasper@web.de>
+
+       * automated/icalendar-tests.el: Move from icalendar-testsuite.el;
+       convert to ERT format.
+
+2011-02-14  Chong Yidong  <cyd@stupidchicken.com>
+
+       * automated/bytecomp-tests.el: Move from bytecomp-testsuite.el;
+       convert to ERT format.
+
+2011-02-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * indent/shell.sh:
+       * indent/shell.rc: New files.
+
+2011-01-27  Chong Yidong  <cyd@stupidchicken.com>
+
+       * automated/font-parse-tests.el: Move from
+       font-parse-testsuite.el.
+
+2011-01-26  Chong Yidong  <cyd@stupidchicken.com>
+
+       * font-parse-testsuite.el (test-font-parse-data): New file.
+
 2011-01-13  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * indent/prolog.prolog: Add tokenizing tests.
@@ -230,10 +263,9 @@
 
 ;; Local Variables:
 ;; coding: utf-8
-;; add-log-time-zone-rule: t
 ;; End:
 
-    Copyright (C) 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
+  Copyright (C) 2008-2011  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -249,5 +281,3 @@
 
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; arch-tag: 6f0d1c86-c141-46da-b387-cf17e38c7bf7