Merge changes from emacs-23 branch

[gnu-emacs] / lib-src / ChangeLog

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 160a19099a3e21aa6cb0912f53b2ec19c7b99982..c9031421cea47849b65d4276f6629cec0abd4b29 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-02  Glenn Morris  <rgm@gnu.org>
+
+       * ebrowse.c (version) <emacs_copyright>:
+       * etags.c (print_version) <emacs_copyright>:
+       * rcs2log (Copyright): Set short copyright year to 2011.
+
 2010-11-27  Joe Matarazzo  <joe.matarazzo@gmail.com>  (tiny change)
 
        * ebrowse.c (yylex): If end of input buffer encountered while