BUG: [ 1792565 ] Theming broken in 2.7.5.1 and onwards

diff --git a/Src/Merge.rc b/Src/Merge.rc
index 8e243c5..f2fdac9 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -60,16 +60,6 @@ END
 #endif    // APSTUDIO_INVOKED
 
 
-// Include the manifest file for VC6 and VS2003.Net
-#if _MSC_VER < 1400 && LANGUAGE == LANG_ENGLISH
-  #ifdef UNICODE
-    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "res\\WinMergeU.exe.manifest"
-  #else
-    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "res\\WinMerge.exe.manifest"
-  #endif
-#endif // MSC_VER
-
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Menu

diff --git a/Src/Merge2.rc b/Src/Merge2.rc
index eb79731..fbd1de3 100644 (file)
--- a/Src/Merge2.rc
+++ b/Src/Merge2.rc
@@ -3,6 +3,16 @@
 // $Id$
 
 
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+  #ifdef UNICODE
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "res\\WinMergeU.exe.manifest"
+  #else
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "res\\WinMerge.exe.manifest"
+  #endif
+#endif // MSC_VER
+
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon