Merge changes from emacs-23 branch

[gnu-emacs] / nextstep / ChangeLog

diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog
index ac060bbcee436afaa24e7abc519422411bb56266..26d22b4c90e09b24243b1f7eb6661c583aa9b8fe 100644 (file)
--- a/nextstep/ChangeLog
+++ b/nextstep/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-02  Glenn Morris  <rgm@gnu.org>
+
+       * Cocoa/Emacs.base/Contents/Info.plist:
+       * Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings:
+       * GNUstep/Emacs.base/Resources/Info-gnustep.plist:
+       Set short copyright year to 2011.
+
 2010-10-13  Glenn Morris  <rgm@gnu.org>
 
        * README: Remove information duplicated in AUTHORS.