Merge from emacs-24; up to 2012-04-20T05:47:55Z!eliz@gnu.org

[gnu-emacs] / nextstep / ChangeLog

diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog
index 6a080ac2e316d1ed6680505eea250f05f244fa5d..6451f7a73226088df297482927a1f7af29d5bc5b 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: