diff lib-src/ChangeLog @ 112098:40af77a50adc

Merge changes from emacs-23 branch
author Chong Yidong <cyd@stupidchicken.com>
date Sun, 02 Jan 2011 15:28:40 -0500
parents 141d3f14d8c3 794f724ca655
children 3e52c52bbc1a
line wrap: on
line diff
--- a/lib-src/ChangeLog	Sun Jan 02 11:23:02 2011 +0000
+++ b/lib-src/ChangeLog	Sun Jan 02 15:28:40 2011 -0500
@@ -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