Merge from trunk.

[gnu-emacs] / nextstep / ChangeLog

diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog
index 269aa4a4eefa7539b44baa4cfa09a16f233cbc23..4e8fe39997001ee3be94b010a94cadc7ce42ebc6 100644 (file)
--- a/nextstep/ChangeLog
+++ b/nextstep/ChangeLog
@@ -1,6 +1,34 @@
+2011-10-19  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * INSTALL: Remove XCode part.
+
+2011-10-18  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * Cocoa/Emacs.xcodeproj:
+       * Cocoa/Emacs.xcodeproj/project.pbxproj:
+       Removed.
+
+2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
+
+       * Version 23.3 released.
+
+2011-03-03  Glenn Morris  <rgm@gnu.org>
+
+       * GNUstep/Emacs.base/Resources/Info-gnustep.plist:
+       Refer to etc/NEXTSTEP rather than emacs-app.sf.net.
+
+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.
+       Move historical information to new file ../etc/NEXTSTEP.
+       * AUTHORS: Merge into ./etc/NEXTSTEP and remove file.
 
 2010-10-12  Glenn Morris  <rgm@gnu.org>
 
@@ -188,7 +216,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2008, 2009, 2010  Free Software Foundation, Inc.
+  Copyright (C) 2008-2011  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.