* lisp/textmodes/sgml-mode.el (sgml-syntax-propertize-function):

[gnu-emacs] / nextstep / ChangeLog

diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog
index 07dc3d1bb4cf1d42368844a0f9a760b0b66d0629..c16d7bec1787480b9121b56eba85d08972213d7d 100644 (file)
--- a/nextstep/ChangeLog
+++ b/nextstep/ChangeLog
@@ -1,10 +1,29 @@
-2012-08-15  Chong Yidong  <cyd@gnu.org>
+2012-09-17  Glenn Morris  <rgm@gnu.org>
 
-       * Version 24.2 released.
+       * templates/Info-gnustep.plist.in, templates/InfoPlist.strings.in:
+       * templates/Info.plist.in: Let configure set copyright.
 
-2012-06-01  Chong Yidong  <cyd@gnu.org>
+2012-09-16  Glenn Morris  <rgm@gnu.org>
 
-       * Version 24.1 released.
+       * 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>
 
@@ -231,7 +250,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2008-2012  Free Software Foundation, Inc.
+  Copyright (C) 2008-2013 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.