Fix bug #16299 with assertion violation in set-default-file-modes on Windows.

[bpt/emacs.git] / nt / emacs.rc

diff --git a/nt/emacs.rc b/nt/emacs.rc
index cc93da0..81d283f 100644 (file)
--- a/nt/emacs.rc
+++ b/nt/emacs.rc
@@ -1,6 +1,6 @@
-Emacs ICON   icons\emacs.ico
-32649 CURSOR icons\hand.cur
-#ifdef WIN64
+Emacs ICON   icons/emacs.ico
+32649 CURSOR icons/hand.cur
+#if defined (WIN64) || defined (__x86_64__)
 1 24 "emacs-x64.manifest"
 #else
 1 24 "emacs-x86.manifest"
@@ -11,8 +11,8 @@ Emacs ICON   icons\emacs.ico
 #endif
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 24,2,90,0
- PRODUCTVERSION 24,2,90,0
+ FILEVERSION 24,3,50,0
+ PRODUCTVERSION 24,3,50,0
  FILEFLAGSMASK 0x3FL
 #ifdef EMACSDEBUG
  FILEFLAGS 0x1L
@@ -29,12 +29,12 @@ BEGIN
        BEGIN
            VALUE "CompanyName", "Free Software Foundation\0"
            VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0"
-           VALUE "FileVersion", "24, 2, 90, 0\0"
+           VALUE "FileVersion", "24, 3, 50, 0\0"
            VALUE "InternalName", "Emacs\0"
-           VALUE "LegalCopyright", "Copyright (C) 2001-2012\0"
+           VALUE "LegalCopyright", "Copyright (C) 2001-2013\0"
            VALUE "OriginalFilename", "emacs.exe"
            VALUE "ProductName", "Emacs\0"
-           VALUE "ProductVersion", "24, 2, 90, 0\0"
+           VALUE "ProductVersion", "24, 3, 50, 0\0"
            VALUE "OLESelfRegister", "\0"
         END
      END