1 <?xml version="1.0" encoding="Windows-1252"?>
\r
3 ProjectType="Visual C++"
\r
6 ProjectGUID="{8ABB4F84-891A-4748-8507-F5494842173E}"
\r
7 RootNamespace="TortoiseMerge"
\r
9 TargetFrameworkVersion="131072"
\r
24 OutputDirectory="..\bin\Debug\bin"
\r
25 IntermediateDirectory="..\obj\TortoiseMerge\Debug"
\r
26 ConfigurationType="1"
\r
31 Name="VCPreBuildEventTool"
\r
34 Name="VCCustomBuildTool"
\r
37 Name="VCXMLDataGeneratorTool"
\r
40 Name="VCWebServiceProxyGeneratorTool"
\r
44 PreprocessorDefinitions="_DEBUG"
\r
45 MkTypLibCompatible="false"
\r
48 Name="VCCLCompilerTool"
\r
50 AdditionalIncludeDirectories="..\Git"
\r
51 PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;APR_DECLARE_STATIC;APU_DECLARE_STATIC"
\r
52 MinimalRebuild="true"
\r
53 BasicRuntimeChecks="3"
\r
55 TreatWChar_tAsBuiltInType="true"
\r
56 ForceConformanceInForLoopScope="true"
\r
57 UsePrecompiledHeader="2"
\r
59 DebugInformationFormat="4"
\r
62 Name="VCManagedResourceCompilerTool"
\r
65 Name="VCResourceCompilerTool"
\r
66 PreprocessorDefinitions="_DEBUG"
\r
68 AdditionalIncludeDirectories="$(IntDir)"
\r
71 Name="VCPreLinkEventTool"
\r
75 AdditionalDependencies="Crypt32.lib shlwapi.lib Version.lib ../../ext/Subversion\debug_win32\libsvn_diff-nonet.lib ../../ext/Subversion\debug_win32\libsvn_subr-nonet.lib ../../ext/Subversion\debug_win32\libsvn_client-nonet.lib ../../ext/apr\debug_win32\libapr_tsvn.lib ../../ext/apr-util\debug_win32\libaprutil_tsvn.lib ../../ext/libintl/libintl3-win32/lib/intl3_tsvn.lib ../../ext/Subversion\debug_win32\libsvn_wc-nonet.lib ../../ext/Subversion\debug_win32\libsvn_delta-nonet.lib ../../ext/apr-util\xml\expat\lib\debug_win32\xml.lib"
\r
77 GenerateDebugInformation="true"
\r
79 RandomizedBaseAddress="1"
\r
80 DataExecutionPrevention="0"
\r
87 Name="VCManifestTool"
\r
90 Name="VCXDCMakeTool"
\r
93 Name="VCBscMakeTool"
\r
99 Name="VCAppVerifierTool"
\r
102 Name="VCPostBuildEventTool"
\r
106 Name="Release|Win32"
\r
107 OutputDirectory="..\..\bin\Release\bin"
\r
108 IntermediateDirectory="..\..\obj\TortoiseMerge\Release"
\r
109 ConfigurationType="1"
\r
110 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
\r
113 ManagedExtensions="0"
\r
114 WholeProgramOptimization="1"
\r
117 Name="VCPreBuildEventTool"
\r
120 Name="VCCustomBuildTool"
\r
123 Name="VCXMLDataGeneratorTool"
\r
126 Name="VCWebServiceProxyGeneratorTool"
\r
130 PreprocessorDefinitions="NDEBUG"
\r
131 MkTypLibCompatible="false"
\r
134 Name="VCCLCompilerTool"
\r
136 FavorSizeOrSpeed="2"
\r
137 AdditionalIncludeDirectories="..\Utils;..\Git;..\Utils\MiscUI"
\r
138 PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;APR_DECLARE_STATIC;APU_DECLARE_STATIC"
\r
139 MinimalRebuild="false"
\r
141 TreatWChar_tAsBuiltInType="true"
\r
142 ForceConformanceInForLoopScope="true"
\r
143 UsePrecompiledHeader="2"
\r
145 DebugInformationFormat="3"
\r
148 Name="VCManagedResourceCompilerTool"
\r
151 Name="VCResourceCompilerTool"
\r
152 PreprocessorDefinitions="NDEBUG"
\r
154 AdditionalIncludeDirectories="$(IntDir)"
\r
157 Name="VCPreLinkEventTool"
\r
160 Name="VCLinkerTool"
\r
161 AdditionalDependencies="Crypt32.lib shlwapi.lib Version.lib"
\r
162 LinkIncremental="1"
\r
163 GenerateDebugInformation="true"
\r
165 OptimizeReferences="2"
\r
166 EnableCOMDATFolding="2"
\r
167 OptimizeForWindows98="0"
\r
168 RandomizedBaseAddress="1"
\r
169 DataExecutionPrevention="0"
\r
176 Name="VCManifestTool"
\r
179 Name="VCXDCMakeTool"
\r
182 Name="VCBscMakeTool"
\r
188 Name="VCAppVerifierTool"
\r
191 Name="VCPostBuildEventTool"
\r
195 Name="release_static|Win32"
\r
196 OutputDirectory="..\..\bin\ReleaseStatic\bin"
\r
197 IntermediateDirectory="..\..\obj\TortoiseMerge\ReleaseStatic"
\r
198 ConfigurationType="1"
\r
201 ManagedExtensions="0"
\r
202 WholeProgramOptimization="1"
\r
205 Name="VCPreBuildEventTool"
\r
208 Name="VCCustomBuildTool"
\r
211 Name="VCXMLDataGeneratorTool"
\r
214 Name="VCWebServiceProxyGeneratorTool"
\r
218 PreprocessorDefinitions="NDEBUG"
\r
219 MkTypLibCompatible="false"
\r
222 Name="VCCLCompilerTool"
\r
224 FavorSizeOrSpeed="2"
\r
225 AdditionalIncludeDirectories="..\Git"
\r
226 PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;APR_DECLARE_STATIC;APU_DECLARE_STATIC"
\r
227 MinimalRebuild="false"
\r
229 TreatWChar_tAsBuiltInType="true"
\r
230 ForceConformanceInForLoopScope="true"
\r
231 UsePrecompiledHeader="2"
\r
233 DebugInformationFormat="3"
\r
236 Name="VCManagedResourceCompilerTool"
\r
239 Name="VCResourceCompilerTool"
\r
240 PreprocessorDefinitions="NDEBUG"
\r
242 AdditionalIncludeDirectories="$(IntDir)"
\r
245 Name="VCPreLinkEventTool"
\r
248 Name="VCLinkerTool"
\r
249 AdditionalDependencies="Crypt32.lib shlwapi.lib Version.lib Rpcrt4.lib ../../ext/Subversion\releasestatic_win32\libsvn_diff-nonet.lib ../../ext/Subversion\releasestatic_win32\libsvn_subr-nonet.lib ../../ext/Subversion\releasestatic_win32\libsvn_client-nonet.lib ../../ext/apr\releasestatic_win32\libapr_tsvn.lib ../../ext/apr-util\releasestatic_win32\libaprutil_tsvn.lib ../../ext/Subversion\releasestatic_win32\libsvn_wc-nonet.lib ../../ext/Subversion\releasestatic_win32\libsvn_delta-nonet.lib ../../ext/apr-util\xml\expat\lib\releasestatic_win32\xml.lib"
\r
250 LinkIncremental="1"
\r
251 GenerateDebugInformation="true"
\r
253 OptimizeReferences="2"
\r
254 EnableCOMDATFolding="2"
\r
255 RandomizedBaseAddress="1"
\r
256 DataExecutionPrevention="0"
\r
263 Name="VCManifestTool"
\r
266 Name="VCXDCMakeTool"
\r
269 Name="VCBscMakeTool"
\r
275 Name="VCAppVerifierTool"
\r
278 Name="VCPostBuildEventTool"
\r
282 Name="debug_static|Win32"
\r
283 OutputDirectory="..\..\bin\DebugStatic\bin"
\r
284 IntermediateDirectory="..\..\obj\TortoiseMerge\DebugStatic"
\r
285 ConfigurationType="1"
\r
288 ManagedExtensions="0"
\r
289 WholeProgramOptimization="1"
\r
292 Name="VCPreBuildEventTool"
\r
295 Name="VCCustomBuildTool"
\r
298 Name="VCXMLDataGeneratorTool"
\r
301 Name="VCWebServiceProxyGeneratorTool"
\r
305 PreprocessorDefinitions="NDEBUG"
\r
306 MkTypLibCompatible="false"
\r
309 Name="VCCLCompilerTool"
\r
311 FavorSizeOrSpeed="2"
\r
312 AdditionalIncludeDirectories="..\Git"
\r
313 PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;APR_DECLARE_STATIC;APU_DECLARE_STATIC"
\r
314 MinimalRebuild="false"
\r
316 TreatWChar_tAsBuiltInType="true"
\r
317 ForceConformanceInForLoopScope="true"
\r
318 UsePrecompiledHeader="2"
\r
320 DebugInformationFormat="3"
\r
323 Name="VCManagedResourceCompilerTool"
\r
326 Name="VCResourceCompilerTool"
\r
327 PreprocessorDefinitions="NDEBUG"
\r
329 AdditionalIncludeDirectories="$(IntDir)"
\r
332 Name="VCPreLinkEventTool"
\r
335 Name="VCLinkerTool"
\r
336 AdditionalDependencies="Crypt32.lib shlwapi.lib Version.lib Rpcrt4.lib ../../ext/Subversion\debugstatic_win32\libsvn_diff-nonet.lib ../../ext/Subversion\debugstatic_win32\libsvn_subr-nonet.lib ../../ext/Subversion\debugstatic_win32\libsvn_client-nonet.lib ../../ext/apr\debugstatic_win32\libapr_tsvn.lib ../../ext/apr-util\debugstatic_win32\libaprutil_tsvn.lib ../../ext/Subversion\debugstatic_win32\libsvn_wc-nonet.lib ../../ext/Subversion\debugstatic_win32\libsvn_delta-nonet.lib ../../ext/apr-util\xml\expat\lib\debugstatic_win32\xml.lib"
\r
337 LinkIncremental="1"
\r
338 GenerateDebugInformation="true"
\r
340 OptimizeReferences="2"
\r
341 EnableCOMDATFolding="2"
\r
342 RandomizedBaseAddress="1"
\r
343 DataExecutionPrevention="0"
\r
350 Name="VCManifestTool"
\r
353 Name="VCXDCMakeTool"
\r
356 Name="VCBscMakeTool"
\r
362 Name="VCAppVerifierTool"
\r
365 Name="VCPostBuildEventTool"
\r
370 OutputDirectory="..\..\bin\Debug64\bin"
\r
371 IntermediateDirectory="..\..\obj\TortoiseMerge\Debug64"
\r
372 ConfigurationType="1"
\r
377 Name="VCPreBuildEventTool"
\r
380 Name="VCCustomBuildTool"
\r
383 Name="VCXMLDataGeneratorTool"
\r
386 Name="VCWebServiceProxyGeneratorTool"
\r
390 PreprocessorDefinitions="_DEBUG"
\r
391 MkTypLibCompatible="false"
\r
392 TargetEnvironment="3"
\r
395 Name="VCCLCompilerTool"
\r
397 AdditionalIncludeDirectories="..\..\ext\apr\include;"..\..\ext\apr-util\include";..\..\ext\SubVersion\subversion\include;..\..\ext\SubVersion\subversion\libsvn_diff;..\Utils;..\Utils\NewMenu;..\Utils\ColourPickerXP;..\TortoiseMerge;..\crashrpt;..\;..\SVN;..\Utils\MiscUI"
\r
398 PreprocessorDefinitions="WIN64;_WINDOWS;_DEBUG;APR_DECLARE_STATIC;APU_DECLARE_STATIC"
\r
399 MinimalRebuild="true"
\r
400 BasicRuntimeChecks="3"
\r
402 TreatWChar_tAsBuiltInType="true"
\r
403 ForceConformanceInForLoopScope="true"
\r
404 UsePrecompiledHeader="2"
\r
406 DebugInformationFormat="3"
\r
409 Name="VCManagedResourceCompilerTool"
\r
412 Name="VCResourceCompilerTool"
\r
413 PreprocessorDefinitions="_DEBUG"
\r
415 AdditionalIncludeDirectories="$(IntDir)"
\r
418 Name="VCPreLinkEventTool"
\r
421 Name="VCLinkerTool"
\r
422 AdditionalDependencies="Crypt32.lib shlwapi.lib Version.lib ../../ext/Subversion\debug_x64\libsvn_diff-nonet.lib ../../ext/Subversion\debug_x64\libsvn_subr-nonet.lib ../../ext/Subversion\debug_x64\libsvn_client-nonet.lib ../../ext/apr\debug_x64\libapr_tsvn.lib ../../ext/apr-util\debug_x64\libaprutil_tsvn.lib ../../ext/libintl/libintl3-x64/lib/intl3_tsvn.lib ../../ext/Subversion\debug_x64\libsvn_wc-nonet.lib ../../ext/Subversion\debug_x64\libsvn_delta-nonet.lib ../../ext/apr-util\xml\expat\lib\debug_x64\xml.lib"
\r
423 LinkIncremental="2"
\r
424 GenerateDebugInformation="true"
\r
426 RandomizedBaseAddress="1"
\r
427 DataExecutionPrevention="0"
\r
434 Name="VCManifestTool"
\r
437 Name="VCXDCMakeTool"
\r
440 Name="VCBscMakeTool"
\r
446 Name="VCAppVerifierTool"
\r
449 Name="VCPostBuildEventTool"
\r
454 OutputDirectory="..\..\bin\Release64\bin"
\r
455 IntermediateDirectory="..\..\obj\TortoiseMerge\Release64"
\r
456 ConfigurationType="1"
\r
459 ManagedExtensions="0"
\r
460 WholeProgramOptimization="1"
\r
463 Name="VCPreBuildEventTool"
\r
466 Name="VCCustomBuildTool"
\r
469 Name="VCXMLDataGeneratorTool"
\r
472 Name="VCWebServiceProxyGeneratorTool"
\r
476 PreprocessorDefinitions="NDEBUG"
\r
477 MkTypLibCompatible="false"
\r
478 TargetEnvironment="3"
\r
481 Name="VCCLCompilerTool"
\r
483 FavorSizeOrSpeed="2"
\r
484 AdditionalIncludeDirectories="..\..\ext\apr\include;"..\..\ext\apr-util\include";..\..\ext\Subversion\subversion\include;..\..\ext\Subversion\subversion\libsvn_diff;..\Utils;..\Utils\NewMenu;..\Utils\ColourPickerXP;..\TortoiseMerge;..\crashrpt;..\;..\SVN;..\Utils\MiscUI"
\r
485 PreprocessorDefinitions="WIN64;_WINDOWS;NDEBUG;APR_DECLARE_STATIC;APU_DECLARE_STATIC"
\r
486 MinimalRebuild="false"
\r
488 TreatWChar_tAsBuiltInType="true"
\r
489 ForceConformanceInForLoopScope="true"
\r
490 UsePrecompiledHeader="2"
\r
492 DebugInformationFormat="3"
\r
495 Name="VCManagedResourceCompilerTool"
\r
498 Name="VCResourceCompilerTool"
\r
499 PreprocessorDefinitions="NDEBUG"
\r
501 AdditionalIncludeDirectories="$(IntDir)"
\r
504 Name="VCPreLinkEventTool"
\r
507 Name="VCLinkerTool"
\r
508 AdditionalDependencies="Crypt32.lib shlwapi.lib Version.lib ../../ext/Subversion\release_x64\libsvn_diff-nonet.lib ../../ext/Subversion\release_x64\libsvn_subr-nonet.lib ../../ext/Subversion\release_x64\libsvn_client-nonet.lib ../../ext/apr\release_x64\libapr_tsvn.lib ../../ext/apr-util\release_x64\libaprutil_tsvn.lib ../../ext/libintl/libintl3-x64/lib/intl3_tsvn.lib ../../ext/Subversion\release_x64\libsvn_wc-nonet.lib ../../ext/Subversion\release_x64\libsvn_delta-nonet.lib ../../ext/apr-util\xml\expat\lib\release_x64\xml.lib"
\r
509 LinkIncremental="1"
\r
510 GenerateDebugInformation="true"
\r
512 OptimizeReferences="2"
\r
513 EnableCOMDATFolding="2"
\r
514 OptimizeForWindows98="1"
\r
515 RandomizedBaseAddress="1"
\r
516 DataExecutionPrevention="0"
\r
523 Name="VCManifestTool"
\r
526 Name="VCXDCMakeTool"
\r
529 Name="VCBscMakeTool"
\r
535 Name="VCAppVerifierTool"
\r
538 Name="VCPostBuildEventTool"
\r
542 Name="release_static|x64"
\r
543 OutputDirectory="$(PlatformName)\$(ConfigurationName)"
\r
544 IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
\r
545 ConfigurationType="1"
\r
546 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
\r
549 ManagedExtensions="0"
\r
550 WholeProgramOptimization="1"
\r
553 Name="VCPreBuildEventTool"
\r
556 Name="VCCustomBuildTool"
\r
559 Name="VCXMLDataGeneratorTool"
\r
562 Name="VCWebServiceProxyGeneratorTool"
\r
566 PreprocessorDefinitions="NDEBUG"
\r
567 MkTypLibCompatible="false"
\r
568 TargetEnvironment="3"
\r
571 Name="VCCLCompilerTool"
\r
573 FavorSizeOrSpeed="2"
\r
574 AdditionalIncludeDirectories="..\..\ext\apr\include;"..\..\ext\apr-util\include";..\..\ext\Subversion\subversion\include;..\..\ext\Subversion\subversion\libsvn_diff;..\Utils;..\Utils\NewMenu;..\Utils\ColourPickerXP;..\TortoiseMerge;..\crashrpt;..\;..\SVN;..\Utils\MiscUI"
\r
575 PreprocessorDefinitions="WIN64;_WINDOWS;NDEBUG;APR_DECLARE_STATIC;APU_DECLARE_STATIC"
\r
576 MinimalRebuild="false"
\r
578 TreatWChar_tAsBuiltInType="true"
\r
579 ForceConformanceInForLoopScope="true"
\r
580 UsePrecompiledHeader="2"
\r
582 DebugInformationFormat="3"
\r
585 Name="VCManagedResourceCompilerTool"
\r
588 Name="VCResourceCompilerTool"
\r
589 PreprocessorDefinitions="NDEBUG"
\r
591 AdditionalIncludeDirectories="$(IntDir)"
\r
594 Name="VCPreLinkEventTool"
\r
597 Name="VCLinkerTool"
\r
598 AdditionalDependencies="Crypt32.lib shlwapi.lib Version.lib ../../ext/Subversion\release_x64\libsvn_diff-nonet.lib ../../ext/Subversion\release_x64\libsvn_subr-nonet.lib ../../ext/Subversion\release_x64\libsvn_client-nonet.lib ../../ext/apr\release_x64\libapr_tsvn.lib ../../ext/apr-util\release_x64\libaprutil_tsvn.lib ../../ext/libintl/libintl3-x64/lib/intl3_tsvn.lib ../../ext/Subversion\release_x64\libsvn_wc-nonet.lib ../../ext/Subversion\release_x64\libsvn_delta-nonet.lib ../../ext/apr-util\xml\expat\lib\release_x64\xml.lib"
\r
599 LinkIncremental="1"
\r
600 GenerateDebugInformation="true"
\r
602 OptimizeReferences="2"
\r
603 EnableCOMDATFolding="2"
\r
604 RandomizedBaseAddress="1"
\r
605 DataExecutionPrevention="0"
\r
612 Name="VCManifestTool"
\r
615 Name="VCXDCMakeTool"
\r
618 Name="VCBscMakeTool"
\r
624 Name="VCAppVerifierTool"
\r
627 Name="VCPostBuildEventTool"
\r
631 Name="debug_static|x64"
\r
632 OutputDirectory="$(PlatformName)\$(ConfigurationName)"
\r
633 IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
\r
634 ConfigurationType="1"
\r
635 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
\r
638 ManagedExtensions="0"
\r
639 WholeProgramOptimization="1"
\r
642 Name="VCPreBuildEventTool"
\r
645 Name="VCCustomBuildTool"
\r
648 Name="VCXMLDataGeneratorTool"
\r
651 Name="VCWebServiceProxyGeneratorTool"
\r
655 PreprocessorDefinitions="NDEBUG"
\r
656 MkTypLibCompatible="false"
\r
657 TargetEnvironment="3"
\r
660 Name="VCCLCompilerTool"
\r
662 FavorSizeOrSpeed="2"
\r
663 AdditionalIncludeDirectories="..\..\ext\apr\include;"..\..\ext\apr-util\include";..\..\ext\Subversion\subversion\include;..\..\ext\Subversion\subversion\libsvn_diff;..\Utils;..\Utils\NewMenu;..\Utils\ColourPickerXP;..\TortoiseMerge;..\crashrpt;..\;..\SVN;..\Utils\MiscUI"
\r
664 PreprocessorDefinitions="WIN64;_WINDOWS;NDEBUG;APR_DECLARE_STATIC;APU_DECLARE_STATIC"
\r
665 MinimalRebuild="false"
\r
667 TreatWChar_tAsBuiltInType="true"
\r
668 ForceConformanceInForLoopScope="true"
\r
669 UsePrecompiledHeader="2"
\r
671 DebugInformationFormat="3"
\r
674 Name="VCManagedResourceCompilerTool"
\r
677 Name="VCResourceCompilerTool"
\r
678 PreprocessorDefinitions="NDEBUG"
\r
680 AdditionalIncludeDirectories="$(IntDir)"
\r
683 Name="VCPreLinkEventTool"
\r
686 Name="VCLinkerTool"
\r
687 AdditionalDependencies="Crypt32.lib shlwapi.lib Version.lib ../../ext/Subversion\release_x64\libsvn_diff-nonet.lib ../../ext/Subversion\release_x64\libsvn_subr-nonet.lib ../../ext/Subversion\release_x64\libsvn_client-nonet.lib ../../ext/apr\release_x64\libapr_tsvn.lib ../../ext/apr-util\release_x64\libaprutil_tsvn.lib ../../ext/libintl/libintl3-x64/lib/intl3_tsvn.lib ../../ext/Subversion\release_x64\libsvn_wc-nonet.lib ../../ext/Subversion\release_x64\libsvn_delta-nonet.lib ../../ext/apr-util\xml\expat\lib\release_x64\xml.lib"
\r
688 LinkIncremental="1"
\r
689 GenerateDebugInformation="true"
\r
691 OptimizeReferences="2"
\r
692 EnableCOMDATFolding="2"
\r
693 RandomizedBaseAddress="1"
\r
694 DataExecutionPrevention="0"
\r
701 Name="VCManifestTool"
\r
704 Name="VCXDCMakeTool"
\r
707 Name="VCBscMakeTool"
\r
713 Name="VCAppVerifierTool"
\r
716 Name="VCPostBuildEventTool"
\r
724 Name="Source Files"
\r
725 Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
\r
726 UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
\r
729 RelativePath=".\AboutDlg.cpp"
\r
733 RelativePath=".\BaseView.cpp"
\r
737 RelativePath=".\BottomView.cpp"
\r
741 RelativePath=".\DiffColors.cpp"
\r
745 RelativePath=".\DiffData.cpp"
\r
749 RelativePath=".\FilePatchesDlg.cpp"
\r
753 RelativePath=".\FileTextLines.cpp"
\r
757 RelativePath=".\FindDlg.cpp"
\r
761 RelativePath=".\LeftView.cpp"
\r
765 RelativePath=".\LineDiffBar.cpp"
\r
769 RelativePath=".\LocatorBar.cpp"
\r
773 RelativePath=".\MainFrm.cpp"
\r
777 RelativePath="..\Utils\MiscUI\MessageBox.cpp"
\r
781 RelativePath=".\OpenDlg.cpp"
\r
785 RelativePath=".\Patch.cpp"
\r
789 RelativePath="..\Utils\MiscUI\ProgressDlg.cpp"
\r
793 RelativePath=".\RightView.cpp"
\r
797 RelativePath=".\SetColorPage.cpp"
\r
801 RelativePath=".\SetMainPage.cpp"
\r
805 RelativePath=".\Settings.cpp"
\r
809 RelativePath=".\stdafx.cpp"
\r
815 Name="VCCLCompilerTool"
\r
816 UsePrecompiledHeader="1"
\r
818 </FileConfiguration>
\r
820 Name="Release|Win32"
\r
823 Name="VCCLCompilerTool"
\r
824 UsePrecompiledHeader="1"
\r
826 </FileConfiguration>
\r
828 Name="release_static|Win32"
\r
831 Name="VCCLCompilerTool"
\r
832 UsePrecompiledHeader="1"
\r
834 </FileConfiguration>
\r
836 Name="debug_static|Win32"
\r
839 Name="VCCLCompilerTool"
\r
840 UsePrecompiledHeader="1"
\r
842 </FileConfiguration>
\r
847 Name="VCCLCompilerTool"
\r
848 UsePrecompiledHeader="1"
\r
850 </FileConfiguration>
\r
855 Name="VCCLCompilerTool"
\r
856 UsePrecompiledHeader="1"
\r
858 </FileConfiguration>
\r
860 Name="release_static|x64"
\r
863 Name="VCCLCompilerTool"
\r
864 UsePrecompiledHeader="1"
\r
866 </FileConfiguration>
\r
868 Name="debug_static|x64"
\r
871 Name="VCCLCompilerTool"
\r
872 UsePrecompiledHeader="1"
\r
874 </FileConfiguration>
\r
877 RelativePath=".\TortoiseMerge.cpp"
\r
881 RelativePath=".\Undo.cpp"
\r
885 RelativePath=".\ViewData.cpp"
\r
889 RelativePath=".\WorkingFile.cpp"
\r
894 Name="Header Files"
\r
895 Filter="h;hpp;hxx;hm;inl;inc;xsd"
\r
896 UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
\r
899 RelativePath=".\AboutDlg.h"
\r
903 RelativePath=".\BaseView.h"
\r
907 RelativePath=".\BottomView.h"
\r
911 RelativePath=".\DiffColors.h"
\r
915 RelativePath=".\DiffData.h"
\r
919 RelativePath=".\DiffStates.h"
\r
923 RelativePath=".\EOL.h"
\r
927 RelativePath=".\FilePatchesDlg.h"
\r
931 RelativePath=".\FileTextLines.h"
\r
935 RelativePath=".\FindDlg.h"
\r
939 RelativePath=".\LeftView.h"
\r
943 RelativePath=".\LineDiffBar.h"
\r
947 RelativePath=".\LocatorBar.h"
\r
951 RelativePath=".\MainFrm.h"
\r
955 RelativePath=".\OpenDlg.h"
\r
959 RelativePath=".\Patch.h"
\r
963 RelativePath="..\Utils\MiscUI\ProgressDlg.h"
\r
967 RelativePath=".\resource.h"
\r
971 RelativePath=".\RightView.h"
\r
975 RelativePath=".\SetColorPage.h"
\r
979 RelativePath=".\SetMainPage.h"
\r
983 RelativePath=".\Settings.h"
\r
987 RelativePath=".\stdafx.h"
\r
991 RelativePath="..\Svn\SVNAdminDir.h"
\r
995 RelativePath="..\SVN\SVNLineDiff.h"
\r
999 RelativePath=".\TortoiseMerge.h"
\r
1003 RelativePath=".\Undo.h"
\r
1007 RelativePath=".\ViewData.h"
\r
1011 RelativePath=".\WorkingFile.h"
\r
1016 Name="Resource Files"
\r
1017 Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
\r
1018 UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
\r
1021 RelativePath="..\Resources\download.avi"
\r
1025 RelativePath="..\Resources\lineadded.ico"
\r
1029 RelativePath="..\Resources\lineconflicted.ico"
\r
1033 RelativePath="..\Resources\lineconflictedignored.ico"
\r
1037 RelativePath="..\Resources\lineedited.ico"
\r
1041 RelativePath="..\Resources\LineEndingCR.ico"
\r
1045 RelativePath="..\Resources\LineEndingCRLF.ico"
\r
1049 RelativePath="..\Resources\LineEndingLF.ico"
\r
1053 RelativePath="..\Resources\lineequal.ico"
\r
1057 RelativePath="..\Resources\lineremoved.ico"
\r
1061 RelativePath="..\Resources\linewhitespace.ico"
\r
1065 RelativePath="..\Resources\Toolbar.bmp"
\r
1069 RelativePath="..\Resources\TortoiseMerge.ico"
\r
1073 RelativePath="..\Resources\TortoiseMerge.rc2"
\r
1077 RelativePath="..\Resources\tortoisemerge_logoflipped.bmp"
\r
1081 RelativePath="..\Resources\TortoiseMergeENG.rc"
\r
1085 RelativePath="..\Resources\tortoisesvn_logoflipped.bmp"
\r
1089 RelativePath="..\Resources\ttf_glyph.bmp"
\r
1097 Name="Source Files"
\r
1100 RelativePath=".\AppUtils.cpp"
\r
1104 RelativePath="..\Utils\MiscUI\BrowseFolder.cpp"
\r
1108 RelativePath="..\Utils\CmdLineParser.cpp"
\r
1112 RelativePath="..\Utils\MiscUI\DIB.cpp"
\r
1116 RelativePath="..\Utils\DirFileEnum.cpp"
\r
1120 RelativePath="..\Utils\DragDropImpl.cpp"
\r
1122 <FileConfiguration
\r
1123 Name="Debug|Win32"
\r
1126 Name="VCCLCompilerTool"
\r
1127 UsePrecompiledHeader="0"
\r
1129 </FileConfiguration>
\r
1130 <FileConfiguration
\r
1131 Name="Release|Win32"
\r
1134 Name="VCCLCompilerTool"
\r
1135 UsePrecompiledHeader="0"
\r
1137 </FileConfiguration>
\r
1138 <FileConfiguration
\r
1139 Name="release_static|Win32"
\r
1142 Name="VCCLCompilerTool"
\r
1143 UsePrecompiledHeader="0"
\r
1145 </FileConfiguration>
\r
1146 <FileConfiguration
\r
1147 Name="debug_static|Win32"
\r
1150 Name="VCCLCompilerTool"
\r
1151 UsePrecompiledHeader="0"
\r
1153 </FileConfiguration>
\r
1154 <FileConfiguration
\r
1158 Name="VCCLCompilerTool"
\r
1159 UsePrecompiledHeader="0"
\r
1161 </FileConfiguration>
\r
1162 <FileConfiguration
\r
1163 Name="Release|x64"
\r
1166 Name="VCCLCompilerTool"
\r
1167 UsePrecompiledHeader="0"
\r
1169 </FileConfiguration>
\r
1170 <FileConfiguration
\r
1171 Name="release_static|x64"
\r
1174 Name="VCCLCompilerTool"
\r
1175 UsePrecompiledHeader="0"
\r
1177 </FileConfiguration>
\r
1178 <FileConfiguration
\r
1179 Name="debug_static|x64"
\r
1182 Name="VCCLCompilerTool"
\r
1183 UsePrecompiledHeader="0"
\r
1185 </FileConfiguration>
\r
1188 RelativePath="..\Utils\MiscUI\FileDropEdit.cpp"
\r
1192 RelativePath="..\Utils\MiscUI\HistoryCombo.cpp"
\r
1196 RelativePath="..\Utils\MiscUI\HTMLFormatter.cpp"
\r
1200 RelativePath="..\Utils\MiscUI\HyperLink.cpp"
\r
1204 RelativePath="..\Utils\PathUtils.cpp"
\r
1208 RelativePath="..\Utils\Registry.cpp"
\r
1212 RelativePath="..\Utils\MiscUI\ScrollTool.cpp"
\r
1216 RelativePath="..\Utils\StringUtils.cpp"
\r
1220 RelativePath=".\TempFiles.cpp"
\r
1224 RelativePath="..\Utils\UnicodeUtils.cpp"
\r
1228 RelativePath="..\Utils\MiscUI\WaterEffect.cpp"
\r
1232 RelativePath=".\XSplitter.cpp"
\r
1237 Name="Header Files"
\r
1240 RelativePath=".\AppUtils.h"
\r
1244 RelativePath="..\Utils\MiscUI\BrowseFolder.h"
\r
1248 RelativePath="..\Utils\CmdLineParser.h"
\r
1252 RelativePath="..\Utils\MiscUI\DIB.h"
\r
1256 RelativePath="..\Utils\DirFileEnum.h"
\r
1260 RelativePath="..\Utils\DragDropImpl.h"
\r
1264 RelativePath="..\Utils\MiscUI\FileDropEdit.h"
\r
1268 RelativePath="..\Utils\MiscUI\HistoryCombo.h"
\r
1272 RelativePath="..\Utils\MiscUI\HTMLFormatter.h"
\r
1276 RelativePath="..\Utils\MiscUI\HyperLink.h"
\r
1280 RelativePath="..\Utils\MiscUI\MessageBox.h"
\r
1284 RelativePath="..\Utils\PathUtils.h"
\r
1288 RelativePath="..\Utils\registry.h"
\r
1292 RelativePath="..\Utils\MiscUI\ScrollTool.h"
\r
1296 RelativePath="..\Utils\StringUtils.h"
\r
1300 RelativePath=".\TempFiles.h"
\r
1304 RelativePath="..\Utils\UnicodeUtils.h"
\r
1308 RelativePath="..\Utils\MiscUI\WaterEffect.h"
\r
1316 Name="DevPartner_IsInstrumented"
\r
1320 Name="RESOURCE_FILE"
\r
1321 Value="\Development\Svn\TortoiseSVN\src\Resources\TortoiseMergeENG.rc"
\r
1324 </VisualStudioProject>
\r