Merge.

4 files changed, 10 insertions, 10 deletions

diff --git a/nt/config.nt b/nt/config.nt
index 7ab89add0fc..87c5f5cc8aa 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -324,7 +324,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define PACKAGE "emacs"
 
 /* Version number of package */
-#define VERSION "24.0.90"
+#define VERSION "24.0.91"
 
 /* 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 8d0df022646..9f7fc6f14aa 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,90,0
- PRODUCTVERSION 24,0,90,0
+ FILEVERSION 24,0,91,0
+ PRODUCTVERSION 24,0,91,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, 90, 0\0"
+            VALUE "FileVersion", "24, 0, 91, 0\0"
             VALUE "InternalName", "Emacs\0"
             VALUE "LegalCopyright", "Copyright (C) 2001-2011\0"
             VALUE "OriginalFilename", "emacs.exe"
             VALUE "ProductName", "Emacs\0"
-            VALUE "ProductVersion", "24, 0, 90, 0\0"
+            VALUE "ProductVersion", "24, 0, 91, 0\0"
             VALUE "OLESelfRegister", "\0"
          END
      END
diff --git a/nt/emacsclient.rc b/nt/emacsclient.rc
index db98b46fb15..6de1daeb959 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,90,0
- PRODUCTVERSION 24,0,90,0
+ FILEVERSION 24,0,91,0
+ PRODUCTVERSION 24,0,91,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, 90, 0\0"
+            VALUE "FileVersion", "24, 0, 91, 0\0"
             VALUE "InternalName", "EmacsClient\0"
             VALUE "LegalCopyright", "Copyright (C) 2001-2011\0"
             VALUE "OriginalFilename", "emacsclientw.exe"
             VALUE "ProductName", "EmacsClient\0"
-            VALUE "ProductVersion", "24, 0, 90, 0\0"
+            VALUE "ProductVersion", "24, 0, 91, 0\0"
             VALUE "OLESelfRegister", "\0"
          END
      END
diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index 07d9be2c117..05631855f6a 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.90

+VERSION         = 24.0.91

 

 TMP_DIST_DIR    = emacs-$(VERSION)