[Winmerge-svn] SF.net SVN: winmerge: [3758] branches/R2_6

[<ki...@us...>]

Revision: 3758
          http://svn.sourceforge.net/winmerge/?rev=3758&view=rev
Author:   kimmov
Date:     2006-11-02 09:48:14 -0800 (Thu, 02 Nov 2006)

Log Message:
-----------
PATCH: [ 1588212 ] Add manifest file to resource file

Modified Paths:
--------------
    branches/R2_6/Src/Changes.txt
    branches/R2_6/Src/Languages/Brazilian/MergeBrazilian.rc
    branches/R2_6/Src/Languages/Bulgarian/MergeBulgarian.rc
    branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc
    branches/R2_6/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
    branches/R2_6/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
    branches/R2_6/Src/Languages/Czech/MergeCzech.rc
    branches/R2_6/Src/Languages/Danish/MergeDanish.rc
    branches/R2_6/Src/Languages/Dutch/MergeDutch.rc
    branches/R2_6/Src/Languages/French/MergeFrench.rc
    branches/R2_6/Src/Languages/German/MergeGerman.rc
    branches/R2_6/Src/Languages/Hungarian/MergeHungarian.rc
    branches/R2_6/Src/Languages/Italian/MergeItalian.rc
    branches/R2_6/Src/Languages/Japanese/MergeJapanese.rc
    branches/R2_6/Src/Languages/Korean/MergeKorean.rc
    branches/R2_6/Src/Languages/Norwegian/MergeNorwegian.rc
    branches/R2_6/Src/Languages/Polish/MergePolish.rc
    branches/R2_6/Src/Languages/Russian/MergeRussian.rc
    branches/R2_6/Src/Languages/Slovak/MergeSlovak.rc
    branches/R2_6/Src/Languages/Spanish/MergeSpanish.rc
    branches/R2_6/Src/Languages/Swedish/MergeSwedish.rc
    branches/R2_6/Src/Languages/Turkish/MergeTurkish.rc
    branches/R2_6/Src/Merge.rc

Added Paths:
-----------
    branches/R2_6/Src/res/WinMerge.exe.manifest
    branches/R2_6/Src/res/WinMergeU.exe.manifest

Removed Paths:
-------------
    branches/R2_6/Installer/InnoSetup/WinMerge.exe.manifest
    branches/R2_6/Installer/InnoSetup/WinMergeU.exe.manifest

Deleted: branches/R2_6/Installer/InnoSetup/WinMerge.exe.manifest
===================================================================
--- branches/R2_6/Installer/InnoSetup/WinMerge.exe.manifest	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Installer/InnoSetup/WinMerge.exe.manifest	2006-11-02 17:48:14 UTC (rev 3758)
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-	<assemblyIdentity
-	   version="1.0.0.0"
-	   processorArchitecture="X86"
-	   name="Microsoft.Winweb.WinMerge"
-	   type="win32"
-	/>
-	<description>WinMerge Application</description>
-	<dependency>
-	   <dependentAssembly>
-	     <assemblyIdentity
-	       type="win32"
-	       name="Microsoft.Windows.Common-Controls"
-	       version="6.0.0.0"
-	       processorArchitecture="X86"
-	       publicKeyToken="6595b64144ccf1df"
-	       language="*"
-	     />
-	   </dependentAssembly>
-	</dependency>
-</assembly>
\ No newline at end of file

Deleted: branches/R2_6/Installer/InnoSetup/WinMergeU.exe.manifest
===================================================================
--- branches/R2_6/Installer/InnoSetup/WinMergeU.exe.manifest	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Installer/InnoSetup/WinMergeU.exe.manifest	2006-11-02 17:48:14 UTC (rev 3758)
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-	<assemblyIdentity
-	   version="1.0.0.0"
-	   processorArchitecture="X86"
-	   name="Microsoft.Winweb.WinMerge"
-	   type="win32"
-	/>
-	<description>WinMerge Application</description>
-	<dependency>
-	   <dependentAssembly>
-	     <assemblyIdentity
-	       type="win32"
-	       name="Microsoft.Windows.Common-Controls"
-	       version="6.0.0.0"
-	       processorArchitecture="X86"
-	       publicKeyToken="6595b64144ccf1df"
-	       language="*"
-	     />
-	   </dependentAssembly>
-	</dependency>
-</assembly>
\ No newline at end of file

Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Changes.txt	2006-11-02 17:48:14 UTC (rev 3758)
@@ -2,6 +2,13 @@
 Add new items to top.
 (This summarizes all changes to all files under Src, including Src\Languages.)
 
+2006-11-02 Kimmo
+ PATCH: [ 1588212 ] Add manifest file to resource file
+  Src: Merge.rc
+  Src/Languages/*: Merge*.rc
+  Move files from Installer/InnoSetup: WinMerge.exe.manifest WinMergeU.exe.manifest
+   to Src/res
+
 2006-10-31 Kimmo
  PATCH: [ 1586869 ] Fix File Select -dialog modality
   Src: DirCmpReportDlg.cpp FileFiltersDlg.cpp MainFrm.cpp Merge.cpp Merge.h

Modified: branches/R2_6/Src/Languages/Brazilian/MergeBrazilian.rc
===================================================================
--- branches/R2_6/Src/Languages/Brazilian/MergeBrazilian.rc	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Brazilian/MergeBrazilian.rc	2006-11-02 17:48:14 UTC (rev 3758)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// 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

Modified: branches/R2_6/Src/Languages/Bulgarian/MergeBulgarian.rc
===================================================================
--- branches/R2_6/Src/Languages/Bulgarian/MergeBulgarian.rc	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Bulgarian/MergeBulgarian.rc	2006-11-02 17:48:14 UTC (rev 3758)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// 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

Modified: branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc
===================================================================
--- branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc	2006-11-02 17:48:14 UTC (rev 3758)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// 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

Modified: branches/R2_6/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
===================================================================
--- branches/R2_6/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc	2006-11-02 17:48:14 UTC (rev 3758)
@@ -62,6 +62,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// 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

Modified: branches/R2_6/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
===================================================================
--- branches/R2_6/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc	2006-11-02 17:48:14 UTC (rev 3758)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// 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

Modified: branches/R2_6/Src/Languages/Czech/MergeCzech.rc
===================================================================
--- branches/R2_6/Src/Languages/Czech/MergeCzech.rc	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Czech/MergeCzech.rc	2006-11-02 17:48:14 UTC (rev 3758)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// 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

Modified: branches/R2_6/Src/Languages/Danish/MergeDanish.rc
===================================================================
--- branches/R2_6/Src/Languages/Danish/MergeDanish.rc	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Danish/MergeDanish.rc	2006-11-02 17:48:14 UTC (rev 3758)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// 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

Modified: branches/R2_6/Src/Languages/Dutch/MergeDutch.rc
===================================================================
--- branches/R2_6/Src/Languages/Dutch/MergeDutch.rc	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Dutch/MergeDutch.rc	2006-11-02 17:48:14 UTC (rev 3758)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// 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

Modified: branches/R2_6/Src/Languages/French/MergeFrench.rc
===================================================================
--- branches/R2_6/Src/Languages/French/MergeFrench.rc	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/French/MergeFrench.rc	2006-11-02 17:48:14 UTC (rev 3758)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// 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

Modified: branches/R2_6/Src/Languages/German/MergeGerman.rc
===================================================================
--- branches/R2_6/Src/Languages/German/MergeGerman.rc	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/German/MergeGerman.rc	2006-11-02 17:48:14 UTC (rev 3758)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// 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

Modified: branches/R2_6/Src/Languages/Hungarian/MergeHungarian.rc
===================================================================
--- branches/R2_6/Src/Languages/Hungarian/MergeHungarian.rc	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Hungarian/MergeHungarian.rc	2006-11-02 17:48:14 UTC (rev 3758)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// 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

Modified: branches/R2_6/Src/Languages/Italian/MergeItalian.rc
===================================================================
--- branches/R2_6/Src/Languages/Italian/MergeItalian.rc	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Italian/MergeItalian.rc	2006-11-02 17:48:14 UTC (rev 3758)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// 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

Modified: branches/R2_6/Src/Languages/Japanese/MergeJapanese.rc
===================================================================
--- branches/R2_6/Src/Languages/Japanese/MergeJapanese.rc	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Japanese/MergeJapanese.rc	2006-11-02 17:48:14 UTC (rev 3758)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// 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

Modified: branches/R2_6/Src/Languages/Korean/MergeKorean.rc
===================================================================
--- branches/R2_6/Src/Languages/Korean/MergeKorean.rc	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Korean/MergeKorean.rc	2006-11-02 17:48:14 UTC (rev 3758)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// 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

Modified: branches/R2_6/Src/Languages/Norwegian/MergeNorwegian.rc
===================================================================
--- branches/R2_6/Src/Languages/Norwegian/MergeNorwegian.rc	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Norwegian/MergeNorwegian.rc	2006-11-02 17:48:14 UTC (rev 3758)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// 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

Modified: branches/R2_6/Src/Languages/Polish/MergePolish.rc
===================================================================
--- branches/R2_6/Src/Languages/Polish/MergePolish.rc	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Polish/MergePolish.rc	2006-11-02 17:48:14 UTC (rev 3758)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// 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

Modified: branches/R2_6/Src/Languages/Russian/MergeRussian.rc
===================================================================
--- branches/R2_6/Src/Languages/Russian/MergeRussian.rc	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Russian/MergeRussian.rc	2006-11-02 17:48:14 UTC (rev 3758)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// 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

Modified: branches/R2_6/Src/Languages/Slovak/MergeSlovak.rc
===================================================================
--- branches/R2_6/Src/Languages/Slovak/MergeSlovak.rc	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Slovak/MergeSlovak.rc	2006-11-02 17:48:14 UTC (rev 3758)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// 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

Modified: branches/R2_6/Src/Languages/Spanish/MergeSpanish.rc
===================================================================
--- branches/R2_6/Src/Languages/Spanish/MergeSpanish.rc	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Spanish/MergeSpanish.rc	2006-11-02 17:48:14 UTC (rev 3758)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// 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

Modified: branches/R2_6/Src/Languages/Swedish/MergeSwedish.rc
===================================================================
--- branches/R2_6/Src/Languages/Swedish/MergeSwedish.rc	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Swedish/MergeSwedish.rc	2006-11-02 17:48:14 UTC (rev 3758)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// 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

Modified: branches/R2_6/Src/Languages/Turkish/MergeTurkish.rc
===================================================================
--- branches/R2_6/Src/Languages/Turkish/MergeTurkish.rc	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Turkish/MergeTurkish.rc	2006-11-02 17:48:14 UTC (rev 3758)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// 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

Modified: branches/R2_6/Src/Merge.rc
===================================================================
--- branches/R2_6/Src/Merge.rc	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Merge.rc	2006-11-02 17:48:14 UTC (rev 3758)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// 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

Copied: branches/R2_6/Src/res/WinMerge.exe.manifest (from rev 3757, branches/R2_6/Installer/InnoSetup/WinMerge.exe.manifest)
===================================================================
--- branches/R2_6/Src/res/WinMerge.exe.manifest	                        (rev 0)
+++ branches/R2_6/Src/res/WinMerge.exe.manifest	2006-11-02 17:48:14 UTC (rev 3758)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+	<assemblyIdentity
+	   version="1.0.0.0"
+	   processorArchitecture="X86"
+	   name="Microsoft.Winweb.WinMerge"
+	   type="win32"
+	/>
+	<description>WinMerge Application</description>
+	<dependency>
+	   <dependentAssembly>
+	     <assemblyIdentity
+	       type="win32"
+	       name="Microsoft.Windows.Common-Controls"
+	       version="6.0.0.0"
+	       processorArchitecture="X86"
+	       publicKeyToken="6595b64144ccf1df"
+	       language="*"
+	     />
+	   </dependentAssembly>
+	</dependency>
+</assembly>
\ No newline at end of file

Copied: branches/R2_6/Src/res/WinMergeU.exe.manifest (from rev 3757, branches/R2_6/Installer/InnoSetup/WinMergeU.exe.manifest)
===================================================================
--- branches/R2_6/Src/res/WinMergeU.exe.manifest	                        (rev 0)
+++ branches/R2_6/Src/res/WinMergeU.exe.manifest	2006-11-02 17:48:14 UTC (rev 3758)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+	<assemblyIdentity
+	   version="1.0.0.0"
+	   processorArchitecture="X86"
+	   name="Microsoft.Winweb.WinMerge"
+	   type="win32"
+	/>
+	<description>WinMerge Application</description>
+	<dependency>
+	   <dependentAssembly>
+	     <assemblyIdentity
+	       type="win32"
+	       name="Microsoft.Windows.Common-Controls"
+	       version="6.0.0.0"
+	       processorArchitecture="X86"
+	       publicKeyToken="6595b64144ccf1df"
+	       language="*"
+	     />
+	   </dependentAssembly>
+	</dependency>
+</assembly>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.