Merge from emacs-24; up to 2012-12-25T17:37:29Z!eliz@gnu.org

[bpt/emacs.git] / nextstep / ChangeLog

diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog
index cbdb559..c16d7be 100644 (file)
--- a/nextstep/ChangeLog
+++ b/nextstep/ChangeLog
@@ -1,17 +1,83 @@
-2011-02-28  Chong Yidong  <cyd@stupidchicken.com>
+2012-09-17  Glenn Morris  <rgm@gnu.org>
+
+       * templates/Info-gnustep.plist.in, templates/InfoPlist.strings.in:
+       * templates/Info.plist.in: Let configure set copyright.
+
+2012-09-16  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in: New file.
+       * templates: New directory.
+       * templates/Emacs.desktop.in, templates/Info-gnustep.plist.in:
+       * templates/Info.plist.in, templates/InfoPlist.strings.in:
+       Move here from various Cocoa/, GNUstep/ locations.
+       Let configure set the version number.
+       * Cocoa/Emacs.base/Contents/Info.plist:
+       * Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings:
+       * GNUstep/Emacs.base/Resources/Info-gnustep.plist:
+       * GNUstep/Emacs.base/Resources/Emacs.desktop: Move to templates/.
+       * Cocoa/Emacs.base/Contents/Resources/English.lproj: Remove directory.
+
+2012-04-07  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:
+       * GNUstep/Emacs.base/Resources/Emacs.desktop:
+       Bump version to 24.1.50.
+
+2012-01-05  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:
+       Update short copyright year to 2012.
+
+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>
+
+       * 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:
@@ -60,8 +126,8 @@
 
 2009-02-01  Adrian Robert  <Adrian.B.Robert@gmail.com>
 
-       * Cocoa/Emacs.base/Contents/Resources/preferences.nib: Remove
-       cursor blink slider, add confirm quit checkbox.
+       * Cocoa/Emacs.base/Contents/Resources/preferences.nib:
+       Remove cursor blink slider, add confirm quit checkbox.
 
 2009-01-05  Glenn Morris  <rgm@gnu.org>
 
@@ -182,10 +248,9 @@
 
 ;; Local Variables:
 ;; coding: utf-8
-;; add-log-time-zone-rule: t
 ;; End:
 
-    Copyright (C) 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
+  Copyright (C) 2008-2013 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -201,5 +266,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