Merge changes from emacs-23 branch

[gnu-emacs] / nextstep / ChangeLog

diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog
index 2fd7dd4f1fc26127557c421241e7f88f09f49ac4..26d22b4c90e09b24243b1f7eb6661c583aa9b8fe 100644 (file)
--- a/nextstep/ChangeLog
+++ b/nextstep/ChangeLog
@@ -3,11 +3,28 @@
        * 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.
+       Move historical information to new file ../etc/NEXTSTEP.
+       * AUTHORS: Merge into ./etc/NEXTSTEP and remove file.
+
+2010-10-12  Glenn Morris  <rgm@gnu.org>
+
+       * FOR-RELEASE: Merge into ../etc/TODO.
+
+       * DEV-NOTES: Move to ../admin/notes/nextstep.
 
 2010-05-07  Chong Yidong  <cyd@stupidchicken.com>
 
        * Version 23.2 released.
 
+2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
+
+       * Branch for 23.2.
+
 2010-01-11  Glenn Morris  <rgm@gnu.org>
 
        * Cocoa/Emacs.base/Contents/Info.plist:
@@ -178,10 +195,9 @@
 
 ;; Local Variables:
 ;; coding: utf-8
-;; add-log-time-zone-rule: t
 ;; End:
 
-    Copyright (C) 2008, 2009, 2010  Free Software Foundation, Inc.
+  Copyright (C) 2008, 2009, 2010  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -197,5 +213,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: 963ee08e-8e76-485f-9cfb-65a4333a073c