diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-04-07 13:00:16 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-04-07 13:00:16 -0700 |
| commit | f3774f20c34ca2590d3ea58d44317386aca9016e (patch) | |
| tree | 46aec371bd702e21c9790c2c24868131f543a19f /nt | |
| parent | a1ed8b05eedc1bded036d1c35a867fbdc7a1eba2 (diff) | |
| download | emacs-f3774f20c34ca2590d3ea58d44317386aca9016e.tar.gz | |
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 'nt')
| -rw-r--r-- | nt/ChangeLog | 5 | ||||
| -rw-r--r-- | nt/config.nt | 2 | ||||
| -rw-r--r-- | nt/emacs.rc | 8 | ||||
| -rw-r--r-- | nt/emacsclient.rc | 8 | ||||
| -rw-r--r-- | nt/makefile.w32-in | 2 |
5 files changed, 15 insertions, 10 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index 88cafb59859..349a43fe692 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,8 @@ +2012-04-07 Glenn Morris <rgm@gnu.org> + + * config.nt, makefile.w32-in, emacs.rc, emacsclient.rc: + Bump version to 24.1.50. + 2012-04-07 Eli Zaretskii <eliz@gnu.org> * configure.bat: Support building with libxml2. diff --git a/nt/config.nt b/nt/config.nt index 2e8215b3488..8aadf2c150d 100644 --- a/nt/config.nt +++ b/nt/config.nt @@ -331,7 +331,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #define PACKAGE "emacs" /* Version number of package */ -#define VERSION "24.0.95" +#define VERSION "24.1.50" /* Define to `__inline__' or `__inline' if that's what the C compiler calls it, or to nothing if 'inline' is not supported under any name. */ diff --git a/nt/emacs.rc b/nt/emacs.rc index a5fd0e3163b..7a6b00ef2a8 100644 --- a/nt/emacs.rc +++ b/nt/emacs.rc @@ -7,8 +7,8 @@ Emacs ICON icons\emacs.ico #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 24,0,95,0 - PRODUCTVERSION 24,0,95,0 + FILEVERSION 24,1,50,0 + PRODUCTVERSION 24,1,50,0 FILEFLAGSMASK 0x3FL #ifdef EMACSDEBUG FILEFLAGS 0x1L @@ -25,12 +25,12 @@ BEGIN BEGIN VALUE "CompanyName", "Free Software Foundation\0" VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0" - VALUE "FileVersion", "24, 0, 95, 0\0" + VALUE "FileVersion", "24, 1, 50, 0\0" VALUE "InternalName", "Emacs\0" VALUE "LegalCopyright", "Copyright (C) 2001-2012\0" VALUE "OriginalFilename", "emacs.exe" VALUE "ProductName", "Emacs\0" - VALUE "ProductVersion", "24, 0, 95, 0\0" + VALUE "ProductVersion", "24, 1, 50, 0\0" VALUE "OLESelfRegister", "\0" END END diff --git a/nt/emacsclient.rc b/nt/emacsclient.rc index f0543ea1a6e..d99b2fcd8fa 100644 --- a/nt/emacsclient.rc +++ b/nt/emacsclient.rc @@ -5,8 +5,8 @@ Emacs ICON icons\emacs.ico #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 24,0,95,0 - PRODUCTVERSION 24,0,95,0 + FILEVERSION 24,1,50,0 + PRODUCTVERSION 24,1,50,0 FILEFLAGSMASK 0x3FL #ifdef EMACSDEBUG FILEFLAGS 0x1L @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "Free Software Foundation\0" VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0" - VALUE "FileVersion", "24, 0, 95, 0\0" + VALUE "FileVersion", "24, 1, 50, 0\0" VALUE "InternalName", "EmacsClient\0" VALUE "LegalCopyright", "Copyright (C) 2001-2012\0" VALUE "OriginalFilename", "emacsclientw.exe" VALUE "ProductName", "EmacsClient\0" - VALUE "ProductVersion", "24, 0, 95, 0\0" + VALUE "ProductVersion", "24, 1, 50, 0\0" VALUE "OLESelfRegister", "\0" END END diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in index 48f4e299fc6..f090849e6a9 100644 --- a/nt/makefile.w32-in +++ b/nt/makefile.w32-in @@ -22,7 +22,7 @@ # FIXME: This file uses DOS EOLs. Convert to Unix after 22.1 is out # (and remove or replace this comment). -VERSION = 24.0.95 +VERSION = 24.1.50 TMP_DIST_DIR = emacs-$(VERSION) |