Merge from pending; try to fix-up suboptimal ses ChangeLog.

[bpt/emacs.git] / nextstep / ChangeLog

diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog
index 9df5fcd..6451f7a 100644 (file)
--- a/nextstep/ChangeLog
+++ b/nextstep/ChangeLog
@@ -1,3 +1,11 @@
+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:
@@ -99,8 +107,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>