diff options
| author | Glenn Morris | 2012-04-07 13:00:16 -0700 |
|---|---|---|
| committer | Glenn Morris | 2012-04-07 13:00:16 -0700 |
| commit | f3774f20c34ca2590d3ea58d44317386aca9016e (patch) | |
| tree | 46aec371bd702e21c9790c2c24868131f543a19f /nextstep | |
| parent | a1ed8b05eedc1bded036d1c35a867fbdc7a1eba2 (diff) | |
| download | emacs-f3774f20c34ca2590d3ea58d44317386aca9016e.tar.gz emacs-f3774f20c34ca2590d3ea58d44317386aca9016e.zip | |
Bump trunk version to 24.1.50.
* README, configure.in (AC_INIT): Bump version to 24.1.50.
* doc/emacs/emacsver.texi (EMACSVER): Bump version to 24.1.50.
* doc/man/emacs.1: Bump version to 24.1.50.
* msdos/sed2v2.inp: Bump version to 24.1.50.
* nextstep/Cocoa/Emacs.base/Contents/Info.plist:
* nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings:
* nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist:
* nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop:
Bump version to 24.1.50.
* nt/config.nt, nt/makefile.w32-in, nt/emacs.rc, nt/emacsclient.rc:
Bump version to 24.1.50.
Diffstat (limited to 'nextstep')
5 files changed, 15 insertions, 7 deletions
diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog index 6a080ac2e31..6451f7a7322 100644 --- a/nextstep/ChangeLog +++ b/nextstep/ChangeLog | |||
| @@ -1,3 +1,11 @@ | |||
| 1 | 2012-04-07 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * Cocoa/Emacs.base/Contents/Info.plist: | ||
| 4 | * Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings: | ||
| 5 | * GNUstep/Emacs.base/Resources/Info-gnustep.plist: | ||
| 6 | * GNUstep/Emacs.base/Resources/Emacs.desktop: | ||
| 7 | Bump version to 24.1.50. | ||
| 8 | |||
| 1 | 2012-01-05 Glenn Morris <rgm@gnu.org> | 9 | 2012-01-05 Glenn Morris <rgm@gnu.org> |
| 2 | 10 | ||
| 3 | * Cocoa/Emacs.base/Contents/Info.plist: | 11 | * Cocoa/Emacs.base/Contents/Info.plist: |
diff --git a/nextstep/Cocoa/Emacs.base/Contents/Info.plist b/nextstep/Cocoa/Emacs.base/Contents/Info.plist index 8fa9d4a125b..31100020cc3 100644 --- a/nextstep/Cocoa/Emacs.base/Contents/Info.plist +++ b/nextstep/Cocoa/Emacs.base/Contents/Info.plist | |||
| @@ -553,7 +553,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. | |||
| 553 | <key>CFBundleExecutable</key> | 553 | <key>CFBundleExecutable</key> |
| 554 | <string>Emacs</string> | 554 | <string>Emacs</string> |
| 555 | <key>CFBundleGetInfoString</key> | 555 | <key>CFBundleGetInfoString</key> |
| 556 | <string>Emacs 24.0.95 Copyright (C) 2012 Free Software Foundation, Inc.</string> | 556 | <string>Emacs 24.1.50 Copyright (C) 2012 Free Software Foundation, Inc.</string> |
| 557 | <key>CFBundleIconFile</key> | 557 | <key>CFBundleIconFile</key> |
| 558 | <string>Emacs.icns</string> | 558 | <string>Emacs.icns</string> |
| 559 | <key>CFBundleIdentifier</key> | 559 | <key>CFBundleIdentifier</key> |
| @@ -566,7 +566,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. | |||
| 566 | <string>APPL</string> | 566 | <string>APPL</string> |
| 567 | <!-- This should be the emacs version number. --> | 567 | <!-- This should be the emacs version number. --> |
| 568 | <key>CFBundleShortVersionString</key> | 568 | <key>CFBundleShortVersionString</key> |
| 569 | <string>24.0.95</string> | 569 | <string>24.1.50</string> |
| 570 | <key>CFBundleSignature</key> | 570 | <key>CFBundleSignature</key> |
| 571 | <string>EMAx</string> | 571 | <string>EMAx</string> |
| 572 | <!-- This SHOULD be a build number. --> | 572 | <!-- This SHOULD be a build number. --> |
diff --git a/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings b/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings index 4be577ecc14..cd1920317b0 100644 --- a/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings +++ b/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* Localized versions of Info.plist keys */ | 1 | /* Localized versions of Info.plist keys */ |
| 2 | 2 | ||
| 3 | CFBundleName = "Emacs"; | 3 | CFBundleName = "Emacs"; |
| 4 | CFBundleShortVersionString = "Version 24.0.95"; | 4 | CFBundleShortVersionString = "Version 24.1.50"; |
| 5 | CFBundleGetInfoString = "Emacs version 24.0.95, NS Windowing"; | 5 | CFBundleGetInfoString = "Emacs version 24.1.50, NS Windowing"; |
| 6 | NSHumanReadableCopyright = "Copyright (C) 2012 Free Software Foundation, Inc."; | 6 | NSHumanReadableCopyright = "Copyright (C) 2012 Free Software Foundation, Inc."; |
diff --git a/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop b/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop index add1a608a5e..4e79b4f380e 100644 --- a/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop +++ b/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | [Desktop Entry] | 1 | [Desktop Entry] |
| 2 | Encoding=UTF-8 | 2 | Encoding=UTF-8 |
| 3 | Type=Application | 3 | Type=Application |
| 4 | Version=24.0.95 | 4 | Version=24.1.50 |
| 5 | Categories=GNUstep | 5 | Categories=GNUstep |
| 6 | Name=Emacs | 6 | Name=Emacs |
| 7 | Comment=GNU Emacs for NeXT/Open/GNUstep and OS X | 7 | Comment=GNU Emacs for NeXT/Open/GNUstep and OS X |
diff --git a/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist b/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist index 86e3897421c..e22b9daa373 100644 --- a/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist +++ b/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | ApplicationDescription = "GNU Emacs for GNUstep / OS X"; | 2 | ApplicationDescription = "GNU Emacs for GNUstep / OS X"; |
| 3 | ApplicationIcon = emacs.tiff; | 3 | ApplicationIcon = emacs.tiff; |
| 4 | ApplicationName = Emacs; | 4 | ApplicationName = Emacs; |
| 5 | ApplicationRelease = "24.0.95"; | 5 | ApplicationRelease = "24.1.50"; |
| 6 | Authors = ( | 6 | Authors = ( |
| 7 | "Adrian Robert (GNUstep)", | 7 | "Adrian Robert (GNUstep)", |
| 8 | "Christophe de Dinechin (MacOS X)", | 8 | "Christophe de Dinechin (MacOS X)", |
| @@ -13,7 +13,7 @@ | |||
| 13 | ); | 13 | ); |
| 14 | Copyright = "Copyright (C) 2012 Free Software Foundation, Inc."; | 14 | Copyright = "Copyright (C) 2012 Free Software Foundation, Inc."; |
| 15 | CopyrightDescription = "Released under the GNU General Public License Version 3 or later"; | 15 | CopyrightDescription = "Released under the GNU General Public License Version 3 or later"; |
| 16 | FullVersionID = "Emacs 24.0.95, NS Windowing"; | 16 | FullVersionID = "Emacs 24.1.50, NS Windowing"; |
| 17 | NSExecutable = Emacs; | 17 | NSExecutable = Emacs; |
| 18 | NSIcon = emacs.tiff; | 18 | NSIcon = emacs.tiff; |
| 19 | NSPrincipalClass = NSApplication; | 19 | NSPrincipalClass = NSApplication; |