Merge from emacs-23

[gnu-emacs] / nt / emacs.rc

diff --git a/nt/emacs.rc b/nt/emacs.rc
index 5cb2d3516d97745db966a17c544992a8490a867f..9a71935f251879f27ea7c9f54fb94b3da7eab3a2 100644 (file)
--- a/nt/emacs.rc
+++ b/nt/emacs.rc
@@ -7,8 +7,8 @@ Emacs ICON   icons\emacs.ico
 #endif
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 23,2,91,0
- PRODUCTVERSION 23,2,91,0
+ FILEVERSION 24,0,50,0
+ PRODUCTVERSION 24,0,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", "23, 2, 91, 0\0"
+           VALUE "FileVersion", "24, 0, 50, 0\0"
            VALUE "InternalName", "Emacs\0"
            VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011\0"
            VALUE "OriginalFilename", "emacs.exe"
            VALUE "ProductName", "Emacs\0"
-           VALUE "ProductVersion", "23, 2, 91, 0\0"
+           VALUE "ProductVersion", "24, 0, 50, 0\0"
            VALUE "OLESelfRegister", "\0"
         END
      END