OSDN Git Service

(root) / winmerge-jp / winmerge-jp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 860d9b9)
Remove BuildAll2.cmd, BuildBin.cmd, WinMerge.sln and Merge.vcxproj*
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sun, 1 Oct 2017 10:55:06 +0000 (19:55 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sun, 1 Oct 2017 10:55:06 +0000 (19:55 +0900)
Use *.vs2015.* or *.vs2017.* instead of above

BuildAll2.cmd [deleted file] patch | blob | history
BuildBin.cmd [deleted file] patch | blob | history
Src/Merge.vcxproj [deleted file] patch | blob | history
Src/Merge.vcxproj.filters [deleted file] patch | blob | history
Src/Merge.vs2015.vcxproj patch | blob | history
Src/Merge.vs2015.vcxproj.filters patch | blob | history
Src/Merge.vs2017.vcxproj patch | blob | history
Src/Merge.vs2017.vcxproj.filters patch | blob | history
WinMerge.sln [deleted file] patch | blob | history
WinMerge.vs2015.sln patch | blob | history
WinMerge.vs2017.sln patch | blob | history

diff --git a/BuildAll2.cmd b/BuildAll2.cmd
deleted file mode 100644 (file)
index efda0dc..0000000
--- a/BuildAll2.cmd
+++ /dev/null
@@ -1,4 +0,0 @@
-cd /d "%~dp0"
-call buildmanual.cmd
-call buildbin.cmd
-call buildarc.cmd
diff --git a/BuildBin.cmd b/BuildBin.cmd
deleted file mode 100644 (file)
index 4568e1b..0000000
--- a/BuildBin.cmd
+++ /dev/null
@@ -1,38 +0,0 @@
-cd /d "%~dp0"
-
-del /s Build\*.exe
-del /s BuildTmp\*.res
-
-call SetVersion.cmd
-cscript /nologo ExpandEnvironmenStrings.vbs Version.in > Version.h
-
-setlocal
-for /f "usebackq tokens=*" %%i in (`"%programfiles(x86)%\microsoft visual studio\installer\vswhere.exe" -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`) do (
-  set InstallDir=%%i
-)
-if exist "%InstallDir%\Common7\Tools\vsdevcmd.bat" (
-  call "%InstallDir%\Common7\Tools\vsdevcmd.bat %*
-)
-MSBuild WinMerge.sln /t:Rebuild /p:Configuration="Release Unicode" /p:Platform="Win32" || pause
-MSBuild WinMerge.sln /t:Rebuild /p:Configuration="Release Unicode" /p:Platform="x64" || pause
-endlocal
-
-if exist "%SIGNBAT_PATH%" (
-  call "%SIGNBAT_PATH%" Build\MergeUnicodeRelease\WinMergeU.exe
-  call "%SIGNBAT_PATH%" Build\MergeUnicodeRelease\MergeLang.dll
-  call "%SIGNBAT_PATH%" Build\x64\MergeUnicodeRelease\WinMergeU.exe
-  call "%SIGNBAT_PATH%" Build\x64\MergeUnicodeRelease\MergeLang.dll
-)
-
-mkdir Build\MergeUnicodeRelease\%APPVER% 2> NUL
-mkdir Build\x64\MergeUnicodeRelease\%APPVER% 2> NUL
-copy Build\MergeUnicodeRelease\*.pdb "Build\MergeUnicodeRelease\%APPVER%\"
-copy Build\x64\MergeUnicodeRelease\*.pdb "Build\x64\MergeUnicodeRelease\%APPVER%\"
-
-for %%i in ("%ProgramFiles(x86)%" "%ProgramFiles%") do (
-  if exist "%%~i\Inno Setup 5\iscc.exe" (
-    "%%~i\Inno Setup 5\iscc.exe" "Installer\innosetup\WinMerge.iss" || pause
-    "%%~i\Inno Setup 5\iscc.exe" "Installer\innosetup\WinMergeX64.iss" || pause
-  )
-)
-
diff --git a/Src/Merge.vcxproj b/Src/Merge.vcxproj
deleted file mode 100644 (file)
index a12670a..0000000
--- a/Src/Merge.vcxproj
+++ /dev/null
@@ -1,1176 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <ItemGroup Label="ProjectConfigurations">\r
-    <ProjectConfiguration Include="Test|Win32">\r
-      <Configuration>Test</Configuration>\r
-      <Platform>Win32</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Test|x64">\r
-      <Configuration>Test</Configuration>\r
-      <Platform>x64</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="UnicodeDebug|Win32">\r
-      <Configuration>UnicodeDebug</Configuration>\r
-      <Platform>Win32</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="UnicodeDebug|x64">\r
-      <Configuration>UnicodeDebug</Configuration>\r
-      <Platform>x64</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="UnicodeRelease|Win32">\r
-      <Configuration>UnicodeRelease</Configuration>\r
-      <Platform>Win32</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="UnicodeRelease|x64">\r
-      <Configuration>UnicodeRelease</Configuration>\r
-      <Platform>x64</Platform>\r
-    </ProjectConfiguration>\r
-  </ItemGroup>\r
-  <PropertyGroup Label="Globals">\r
-    <ProjectName>Merge</ProjectName>\r
-    <ProjectGuid>{9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}</ProjectGuid>\r
-    <RootNamespace>Merge</RootNamespace>\r
-    <Keyword>MFCProj</Keyword>\r
-  </PropertyGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'" Label="Configuration">\r
-    <ConfigurationType>Application</ConfigurationType>\r
-    <UseOfMfc>Static</UseOfMfc>\r
-    <CharacterSet>Unicode</CharacterSet>\r
-    <PlatformToolset>v141</PlatformToolset>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|Win32'" Label="Configuration">\r
-    <ConfigurationType>Application</ConfigurationType>\r
-    <UseOfMfc>Static</UseOfMfc>\r
-    <CharacterSet>Unicode</CharacterSet>\r
-    <PlatformToolset>v141</PlatformToolset>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'" Label="Configuration">\r
-    <ConfigurationType>Application</ConfigurationType>\r
-    <UseOfMfc>Static</UseOfMfc>\r
-    <CharacterSet>Unicode</CharacterSet>\r
-    <PlatformToolset>v141_xp</PlatformToolset>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'" Label="Configuration">\r
-    <ConfigurationType>Application</ConfigurationType>\r
-    <UseOfMfc>Static</UseOfMfc>\r
-    <CharacterSet>Unicode</CharacterSet>\r
-    <PlatformToolset>v141</PlatformToolset>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|x64'" Label="Configuration">\r
-    <ConfigurationType>Application</ConfigurationType>\r
-    <UseOfMfc>Static</UseOfMfc>\r
-    <CharacterSet>Unicode</CharacterSet>\r
-    <PlatformToolset>v141</PlatformToolset>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'" Label="Configuration">\r
-    <ConfigurationType>Application</ConfigurationType>\r
-    <UseOfMfc>Static</UseOfMfc>\r
-    <CharacterSet>Unicode</CharacterSet>\r
-    <PlatformToolset>v141_xp</PlatformToolset>\r
-  </PropertyGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
-  <ImportGroup Label="ExtensionSettings">\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Test|Win32'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Test|x64'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-  </ImportGroup>\r
-  <PropertyGroup Label="UserMacros" />\r
-  <PropertyGroup>\r
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">.\..\Build\Merge$(Configuration)\</OutDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">.\..\BuildTmp\Merge$(Configuration)\</IntDir>\r
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">false</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">.\..\Build\$(Platform)\Merge$(Configuration)\</OutDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">.\..\BuildTmp\$(Platform)\Merge$(Configuration)\</IntDir>\r
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">false</LinkIncremental>\r
-    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">true</EmbedManifest>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">.\..\Build\Merge$(Configuration)\</OutDir>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">.\..\Build\Merge$(Configuration)\</OutDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">.\..\BuildTmp\Merge$(Configuration)\</IntDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">.\..\BuildTmp\Merge$(Configuration)\</IntDir>\r
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</LinkIncremental>\r
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">true</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">.\..\Build\$(Platform)\Merge$(Configuration)\</OutDir>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Test|x64'">.\..\Build\$(Platform)\Merge$(Configuration)\</OutDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">.\..\BuildTmp\$(Platform)\Merge$(Configuration)\</IntDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Test|x64'">.\..\BuildTmp\$(Platform)\Merge$(Configuration)\</IntDir>\r
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">true</LinkIncremental>\r
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Test|x64'">true</LinkIncremental>\r
-    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">true</EmbedManifest>\r
-    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Test|x64'">true</EmbedManifest>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">Win$(ProjectName)U</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Test|x64'">Win$(ProjectName)U</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">Win$(ProjectName)U</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Win$(ProjectName)U</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">Win$(ProjectName)U</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">Win$(ProjectName)U</TargetName>\r
-  </PropertyGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">\r
-    <Midl>\r
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <MkTypLibCompatible>true</MkTypLibCompatible>\r
-      <SuppressStartupBanner>true</SuppressStartupBanner>\r
-      <TargetEnvironment>Win32</TargetEnvironment>\r
-      <HeaderFileName>\r
-      </HeaderFileName>\r
-    </Midl>\r
-    <ClCompile>\r
-      <AdditionalOptions>/EHa  %(AdditionalOptions)</AdditionalOptions>\r
-      <Optimization>MinSpace</Optimization>\r
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
-      <AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>WINVER=0x0501;WIN32;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <StringPooling>true</StringPooling>\r
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
-      <FunctionLevelLinking>true</FunctionLevelLinking>\r
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
-      <PrecompiledHeader>Use</PrecompiledHeader>\r
-      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
-      <WarningLevel>Level3</WarningLevel>\r
-      <SuppressStartupBanner>true</SuppressStartupBanner>\r
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
-      <CompileAs>Default</CompileAs>\r
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>\r
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
-      <ExceptionHandling>Async</ExceptionHandling>\r
-    </ClCompile>\r
-    <ResourceCompile>\r
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <Culture>0x0409</Culture>\r
-    </ResourceCompile>\r
-    <Link>\r
-      <AdditionalOptions>/verbose:lib %(AdditionalOptions)</AdditionalOptions>\r
-      <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)/WinMergeU.exe</OutputFile>\r
-      <SuppressStartupBanner>true</SuppressStartupBanner>\r
-      <AdditionalLibraryDirectories>..\Externals\poco\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
-      <IgnoreSpecificDefaultLibraries>msvcrtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>\r
-      <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <SubSystem>Windows</SubSystem>\r
-      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>\r
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
-      <DataExecutionPrevention>\r
-      </DataExecutionPrevention>\r
-      <TargetMachine>MachineX86</TargetMachine>\r
-      <GenerateMapFile>true</GenerateMapFile>\r
-    </Link>\r
-    <PostBuildEvent>\r
-      <Command>\r
-      </Command>\r
-    </PostBuildEvent>\r
-  </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">\r
-    <CustomBuildStep>\r
-      <Command>\r
-      </Command>\r
-      <Outputs>$(TargetDir)WinMergeU.map;%(Outputs)</Outputs>\r
-    </CustomBuildStep>\r
-    <Midl>\r
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <MkTypLibCompatible>true</MkTypLibCompatible>\r
-      <SuppressStartupBanner>true</SuppressStartupBanner>\r
-      <TargetEnvironment>X64</TargetEnvironment>\r
-      <HeaderFileName>\r
-      </HeaderFileName>\r
-    </Midl>\r
-    <ClCompile>\r
-      <AdditionalOptions>/EHa  %(AdditionalOptions)</AdditionalOptions>\r
-      <Optimization>MinSpace</Optimization>\r
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
-      <AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>WINVER=0x0501;WIN64;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <StringPooling>true</StringPooling>\r
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
-      <FunctionLevelLinking>true</FunctionLevelLinking>\r
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
-      <PrecompiledHeader>Use</PrecompiledHeader>\r
-      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
-      <WarningLevel>Level3</WarningLevel>\r
-      <SuppressStartupBanner>true</SuppressStartupBanner>\r
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
-      <CompileAs>Default</CompileAs>\r
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
-      <ExceptionHandling>Async</ExceptionHandling>\r
-    </ClCompile>\r
-    <ResourceCompile>\r
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <Culture>0x0409</Culture>\r
-    </ResourceCompile>\r
-    <Link>\r
-      <AdditionalOptions>/verbose:lib %(AdditionalOptions)</AdditionalOptions>\r
-      <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)/WinMergeU.exe</OutputFile>\r
-      <SuppressStartupBanner>true</SuppressStartupBanner>\r
-      <AdditionalLibraryDirectories>..\Externals\poco\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
-      <IgnoreSpecificDefaultLibraries>msvcrtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>\r
-      <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <SubSystem>Windows</SubSystem>\r
-      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>\r
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
-      <DataExecutionPrevention>\r
-      </DataExecutionPrevention>\r
-      <TargetMachine>MachineX64</TargetMachine>\r
-      <GenerateMapFile>true</GenerateMapFile>\r
-      <OptimizeReferences>\r
-      </OptimizeReferences>\r
-    </Link>\r
-    <PostBuildEvent>\r
-      <Command>\r
-      </Command>\r
-    </PostBuildEvent>\r
-  </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">\r
-    <Midl>\r
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <MkTypLibCompatible>true</MkTypLibCompatible>\r
-      <SuppressStartupBanner>true</SuppressStartupBanner>\r
-      <TargetEnvironment>Win32</TargetEnvironment>\r
-      <HeaderFileName>\r
-      </HeaderFileName>\r
-    </Midl>\r
-    <ClCompile>\r
-      <AdditionalOptions>/EHa  %(AdditionalOptions)</AdditionalOptions>\r
-      <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>WINVER=0x0501;_DEBUG;WIN32;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\r
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
-      <PrecompiledHeader>Use</PrecompiledHeader>\r
-      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
-      <BrowseInformation>true</BrowseInformation>\r
-      <WarningLevel>Level3</WarningLevel>\r
-      <SuppressStartupBanner>true</SuppressStartupBanner>\r
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
-      <CompileAs>Default</CompileAs>\r
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>\r
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
-      <ExceptionHandling>Async</ExceptionHandling>\r
-    </ClCompile>\r
-    <ResourceCompile>\r
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <Culture>0x0409</Culture>\r
-    </ResourceCompile>\r
-    <Link>\r
-      <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)/WinMergeU.exe</OutputFile>\r
-      <SuppressStartupBanner>true</SuppressStartupBanner>\r
-      <AdditionalLibraryDirectories>..\Externals\poco\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
-      <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <SubSystem>Windows</SubSystem>\r
-      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>\r
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
-      <DataExecutionPrevention>\r
-      </DataExecutionPrevention>\r
-      <TargetMachine>MachineX86</TargetMachine>\r
-      <GenerateMapFile>true</GenerateMapFile>\r
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>\r
-    </Link>\r
-    <PostBuildEvent>\r
-      <Command>\r
-      </Command>\r
-    </PostBuildEvent>\r
-  </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">\r
-    <Midl>\r
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <MkTypLibCompatible>true</MkTypLibCompatible>\r
-      <SuppressStartupBanner>true</SuppressStartupBanner>\r
-      <TargetEnvironment>Win32</TargetEnvironment>\r
-      <HeaderFileName>\r
-      </HeaderFileName>\r
-    </Midl>\r
-    <ClCompile>\r
-      <AdditionalOptions>/EHa  %(AdditionalOptions)</AdditionalOptions>\r
-      <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>.;..\Externals\gtest;..\Externals\gtest\include;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>TEST_WINMERGE;WINVER=0x0501;_DEBUG;WIN32;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\r
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
-      <PrecompiledHeader>Use</PrecompiledHeader>\r
-      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
-      <BrowseInformation>true</BrowseInformation>\r
-      <WarningLevel>Level3</WarningLevel>\r
-      <SuppressStartupBanner>true</SuppressStartupBanner>\r
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
-      <CompileAs>Default</CompileAs>\r
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>\r
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
-      <ExceptionHandling>Async</ExceptionHandling>\r
-    </ClCompile>\r
-    <ResourceCompile>\r
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <Culture>0x0409</Culture>\r
-    </ResourceCompile>\r
-    <Link>\r
-      <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)/WinMergeU.exe</OutputFile>\r
-      <SuppressStartupBanner>true</SuppressStartupBanner>\r
-      <AdditionalLibraryDirectories>..\Externals\poco\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
-      <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <SubSystem>Console</SubSystem>\r
-      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>\r
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
-      <DataExecutionPrevention>\r
-      </DataExecutionPrevention>\r
-      <TargetMachine>MachineX86</TargetMachine>\r
-      <GenerateMapFile>true</GenerateMapFile>\r
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>\r
-    </Link>\r
-    <PostBuildEvent>\r
-      <Command>\r
-      </Command>\r
-    </PostBuildEvent>\r
-  </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">\r
-    <CustomBuildStep>\r
-      <Command>\r
-      </Command>\r
-      <Outputs>$(TargetDir)WinMergeU.map;%(Outputs)</Outputs>\r
-    </CustomBuildStep>\r
-    <Midl>\r
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <MkTypLibCompatible>true</MkTypLibCompatible>\r
-      <SuppressStartupBanner>true</SuppressStartupBanner>\r
-      <TargetEnvironment>X64</TargetEnvironment>\r
-      <HeaderFileName>\r
-      </HeaderFileName>\r
-    </Midl>\r
-    <ClCompile>\r
-      <AdditionalOptions>/EHa  %(AdditionalOptions)</AdditionalOptions>\r
-      <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>WINVER=0x0501;_DEBUG;WIN64;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\r
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
-      <PrecompiledHeader>Use</PrecompiledHeader>\r
-      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
-      <BrowseInformation>true</BrowseInformation>\r
-      <WarningLevel>Level3</WarningLevel>\r
-      <SuppressStartupBanner>true</SuppressStartupBanner>\r
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
-      <CompileAs>Default</CompileAs>\r
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
-      <ExceptionHandling>Async</ExceptionHandling>\r
-    </ClCompile>\r
-    <ResourceCompile>\r
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <Culture>0x0409</Culture>\r
-    </ResourceCompile>\r
-    <Link>\r
-      <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)/WinMergeU.exe</OutputFile>\r
-      <SuppressStartupBanner>true</SuppressStartupBanner>\r
-      <AdditionalLibraryDirectories>..\Externals\poco\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
-      <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <SubSystem>Windows</SubSystem>\r
-      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>\r
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
-      <DataExecutionPrevention>\r
-      </DataExecutionPrevention>\r
-      <TargetMachine>MachineX64</TargetMachine>\r
-      <GenerateMapFile>true</GenerateMapFile>\r
-      <Profile>false</Profile>\r
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>\r
-    </Link>\r
-    <PostBuildEvent>\r
-      <Command>\r
-      </Command>\r
-    </PostBuildEvent>\r
-  </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Test|x64'">\r
-    <CustomBuildStep>\r
-      <Command>\r
-      </Command>\r
-      <Outputs>$(TargetDir)WinMergeU.map;%(Outputs)</Outputs>\r
-    </CustomBuildStep>\r
-    <Midl>\r
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <MkTypLibCompatible>true</MkTypLibCompatible>\r
-      <SuppressStartupBanner>true</SuppressStartupBanner>\r
-      <TargetEnvironment>X64</TargetEnvironment>\r
-      <HeaderFileName>\r
-      </HeaderFileName>\r
-    </Midl>\r
-    <ClCompile>\r
-      <AdditionalOptions>/EHa  %(AdditionalOptions)</AdditionalOptions>\r
-      <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>.;..\Externals\gtest;..\Externals\gtest\include;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>TEST_WINMERGE;WINVER=0x0501;_DEBUG;WIN64;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\r
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
-      <PrecompiledHeader>Use</PrecompiledHeader>\r
-      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
-      <BrowseInformation>true</BrowseInformation>\r
-      <WarningLevel>Level3</WarningLevel>\r
-      <SuppressStartupBanner>true</SuppressStartupBanner>\r
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
-      <CompileAs>Default</CompileAs>\r
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
-      <ExceptionHandling>Async</ExceptionHandling>\r
-    </ClCompile>\r
-    <ResourceCompile>\r
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <Culture>0x0409</Culture>\r
-    </ResourceCompile>\r
-    <Link>\r
-      <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)/WinMergeU.exe</OutputFile>\r
-      <SuppressStartupBanner>true</SuppressStartupBanner>\r
-      <AdditionalLibraryDirectories>..\Externals\poco\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
-      <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <SubSystem>Console</SubSystem>\r
-      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>\r
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
-      <DataExecutionPrevention>\r
-      </DataExecutionPrevention>\r
-      <TargetMachine>MachineX64</TargetMachine>\r
-      <GenerateMapFile>true</GenerateMapFile>\r
-      <Profile>false</Profile>\r
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>\r
-    </Link>\r
-    <PostBuildEvent>\r
-      <Command>\r
-      </Command>\r
-    </PostBuildEvent>\r
-  </ItemDefinitionGroup>\r
-  <ItemGroup>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\asp.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\basic.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\batch.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaleditview.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview2.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\ceditreplacedlg.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\cfindtextdlg.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\chcondlg.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\cplusplus.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\cregexp_poco.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\crystaleditviewex.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\crystalparser.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\crystaltextblock.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\cs2cs.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\csharp.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\css.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\ctextmarkerdlg.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\dcl.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\filesup.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\fortran.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\fpattern.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\go.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\gotodlg.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\html.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\ini.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\innosetup.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\is.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\java.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\LineInfo.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\lisp.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\memcombo.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\nsis.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\pascal.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\perl.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\php.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\po.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\powershell.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\python.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\registry.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\rexx.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\rsrc.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\ruby.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\rust.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\sgml.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\sh.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\siod.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\sql.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\statbar.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\string_util.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\SyntaxColors.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\tcl.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\tex.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\UndoRecord.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\verilog.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\ViewableWhitespace.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\xml.cpp" />\r
-    <ClCompile Include="7zCommon.cpp">\r
-    </ClCompile>\r
-    <ClCompile Include="AboutDlg.cpp">\r
-    </ClCompile>\r
-    <ClCompile Include="Common\BCMenu.cpp" />\r
-    <ClCompile Include="Common\Bitmap.cpp" />\r
-    <ClCompile Include="CCPromptDlg.cpp">\r
-    </ClCompile>\r
-    <ClCompile Include="charsets.c">\r
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Test|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Test|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</BrowseInformation>\r
-      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">true</BrowseInformation>\r
-      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">true</BrowseInformation>\r
-      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Test|x64'">true</BrowseInformation>\r
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Disabled</Optimization>\r
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">Disabled</Optimization>\r
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">Disabled</Optimization>\r
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Test|x64'">Disabled</Optimization>\r
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">MinSpace</Optimization>\r
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">MinSpace</Optimization>\r
-    </ClCompile>\r
-    <ClCompile Include="ChildFrm.cpp" />\r
-    <ClCompile Include="Common\ClipBoard.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="Common\CMoveConstraint.cpp" />\r
-    <ClCompile Include="codepage_detect.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="Common\ColorButton.cpp" />\r
-    <ClCompile Include="Common\ExConverter.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="CompareEngines\BinaryCompare.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="CompareOptions.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="CompareStatisticsDlg.cpp" />\r
-    <ClCompile Include="CompareStats.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="ConfigLog.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="ConfirmFolderCopyDlg.cpp" />\r
-    <ClCompile Include="ConflictFileParser.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="Common\coretools.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="DropHandler.cpp" />\r
-    <ClCompile Include="ImgMergeFrm.cpp" />\r
-    <ClCompile Include="Merge7zFormatMergePluginImpl.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="Merge7zFormatShellImpl.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="MergeStatusBar.cpp" />\r
-    <ClCompile Include="OptionsDef.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="OptionsCustomColors.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="DiffContext.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="DiffFileData.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="DiffFileInfo.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="DiffItem.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="DiffItemList.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="DiffList.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="DiffTextBuffer.cpp" />\r
-    <ClCompile Include="DiffThread.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="DiffViewBar.cpp" />\r
-    <ClCompile Include="DiffWrapper.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="DirActions.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="DirCmpReport.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="DirCmpReportDlg.cpp" />\r
-    <ClCompile Include="DirColsDlg.cpp" />\r
-    <ClCompile Include="DirCompProgressBar.cpp" />\r
-    <ClCompile Include="DirDoc.cpp" />\r
-    <ClCompile Include="DirFrame.cpp" />\r
-    <ClCompile Include="DirItem.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="DirScan.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="DirTravel.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="DirView.cpp" />\r
-    <ClCompile Include="DirViewColItems.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="dllpstub.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="EditorFilepathBar.cpp" />\r
-    <ClCompile Include="EncodingErrorBar.cpp" />\r
-    <ClCompile Include="Environment.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="FileActionScript.cpp" />\r
-    <ClCompile Include="FileFilter.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="FileFilterHelper.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="FileFilterMgr.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="FileFiltersDlg.cpp" />\r
-    <ClCompile Include="FileOrFolderSelect.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="FilepathEdit.cpp" />\r
-    <ClCompile Include="FileTextEncoding.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="FileTransform.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="FileVersion.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="FilterCommentsManager.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="FilterList.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="FolderCmp.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="GhostTextBuffer.cpp" />\r
-    <ClCompile Include="GhostTextView.cpp" />\r
-    <ClCompile Include="HexMergeDoc.cpp" />\r
-    <ClCompile Include="HexMergeFrm.cpp" />\r
-    <ClCompile Include="HexMergeView.cpp" />\r
-    <ClCompile Include="Common\LanguageSelect.cpp" />\r
-    <ClCompile Include="JumpList.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="LineFiltersDlg.cpp" />\r
-    <ClCompile Include="LineFiltersList.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="LoadSaveCodepageDlg.cpp" />\r
-    <ClCompile Include="locality.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="LocationBar.cpp" />\r
-    <ClCompile Include="LocationView.cpp" />\r
-    <ClCompile Include="Common\lwdisp.c">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="MainFrm.cpp" />\r
-    <ClCompile Include="markdown.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="Common\MDITabBar.cpp" />\r
-    <ClCompile Include="Merge.cpp" />\r
-    <ClCompile Include="MergeApp.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="MergeCmdLineInfo.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="MergeDoc.cpp" />\r
-    <ClCompile Include="MergeDocDiffSync.cpp" />\r
-    <ClCompile Include="MergeDocEncoding.cpp" />\r
-    <ClCompile Include="MergeDocLineDiffs.cpp" />\r
-    <ClCompile Include="MergeEditView.cpp" />\r
-    <ClCompile Include="Common\MessageBoxDialog.cpp" />\r
-    <ClCompile Include="MovedBlocks.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="MovedLines.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="Common\multiformatText.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="OpenDoc.cpp" />\r
-    <ClCompile Include="OpenFrm.cpp" />\r
-    <ClCompile Include="OpenView.cpp" />\r
-    <ClCompile Include="OptionsDiffColors.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="OptionsDiffOptions.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="OptionsFont.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="OptionsInit.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="common\OptionsMgr.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="OptionsPanel.cpp" />\r
-    <ClCompile Include="OptionsSyntaxColors.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="PatchDlg.cpp" />\r
-    <ClCompile Include="PatchHTML.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="PatchTool.cpp" />\r
-    <ClCompile Include="PathContext.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="paths.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="Common\Picture.cpp" />\r
-    <ClCompile Include="Common\PidlContainer.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="PluginManager.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="Plugins.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="PluginsListDlg.cpp" />\r
-    <ClCompile Include="Common\PreferencesDlg.cpp" />\r
-    <ClCompile Include="ProjectFile.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="ProjectFilePathsDlg.cpp" />\r
-    <ClCompile Include="PropArchive.cpp" />\r
-    <ClCompile Include="PropBackups.cpp" />\r
-    <ClCompile Include="PropCodepage.cpp" />\r
-    <ClCompile Include="PropColors.cpp" />\r
-    <ClCompile Include="PropCompare.cpp" />\r
-    <ClCompile Include="PropCompareBinary.cpp" />\r
-    <ClCompile Include="PropCompareFolder.cpp" />\r
-    <ClCompile Include="PropCompareImage.cpp" />\r
-    <ClCompile Include="PropEditor.cpp" />\r
-    <ClCompile Include="Common\PropertyPageHost.cpp" />\r
-    <ClCompile Include="PropGeneral.cpp" />\r
-    <ClCompile Include="PropMarkerColors.cpp" />\r
-    <ClCompile Include="PropRegistry.cpp" />\r
-    <ClCompile Include="PropShell.cpp" />\r
-    <ClCompile Include="PropSyntaxColors.cpp" />\r
-    <ClCompile Include="PropTextColors.cpp" />\r
-    <ClCompile Include="PropVss.cpp" />\r
-    <ClCompile Include="Common\RegKey.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="Common\RegOptionsMgr.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="SaveClosingDlg.cpp" />\r
-    <ClCompile Include="Common\scbarcf.cpp" />\r
-    <ClCompile Include="Common\scbarg.cpp" />\r
-    <ClCompile Include="SelectUnpackerDlg.cpp" />\r
-    <ClCompile Include="SharedFilterDlg.cpp" />\r
-    <ClCompile Include="Common\ShellContextMenu.cpp" />\r
-    <ClCompile Include="Common\ShellFileOperations.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="Common\sizecbar.cpp" />\r
-    <ClCompile Include="Common\SortHeaderCtrl.cpp" />\r
-    <ClCompile Include="SourceControl.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="Common\SplitterWndEx.cpp" />\r
-    <ClCompile Include="StdAfx.cpp">\r
-      <PrecompiledHeader>Create</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="stringdiffs.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="Common\SuperComboBox.cpp" />\r
-    <ClCompile Include="TempFile.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="Test.cpp" />\r
-    <ClCompile Include="TestFilterDlg.cpp" />\r
-    <ClCompile Include="Common\unicoder.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="Common\UnicodeString.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="Common\UniFile.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="TestMain.cpp" />\r
-    <ClCompile Include="TrDialogs.cpp" />\r
-    <ClCompile Include="UniMarkdownFile.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="Common\varprop.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="Common\version.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="VSSHelper.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="VssPromptDlg.cpp" />\r
-    <ClCompile Include="WMGotoDlg.cpp" />\r
-    <ClCompile Include="diffutils\src\analyze.c">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="diffutils\lib\cmpbuf.c">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="diffutils\src\context.c">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="diffutils\src\Diff.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="diffutils\src\ed.c">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="diffutils\GnuVersion.c">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="diffutils\src\ifdef.c">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="diffutils\src\io.c">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="diffutils\src\normal.c">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="diffutils\src\side.c">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="diffutils\src\util.c">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="diffutils\src\mystat.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="CompareEngines\ByteComparator.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="CompareEngines\ByteCompare.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="CompareEngines\DiffUtils.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="CompareEngines\TimeSizeCompare.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaleditview.h" />\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.h" />\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.h" />\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextview.h" />\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\ceditreplacedlg.h" />\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\cfindtextdlg.h" />\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\chcondlg.h" />\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\cregexp.h" />\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\crystaleditviewex.h" />\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\crystalparser.h" />\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\crystaltextblock.h" />\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\cs2cs.h" />\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\ctextmarkerdlg.h" />\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\editcmd.h" />\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\editreg.h" />\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\edtlib.h" />\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\filesup.h" />\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\fpattern.h" />\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\gotodlg.h" />\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\LineInfo.h" />\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\memcombo.h" />\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\registry.h" />\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\statbar.h" />\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\string_util.h" />\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\SyntaxColors.h" />\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\UndoRecord.h" />\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\ViewableWhitespace.h" />\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\wispelld.h" />\r
-    <ClInclude Include="7zCommon.h" />\r
-    <ClInclude Include="AboutDlg.h" />\r
-    <ClInclude Include="Common\BCMenu.h" />\r
-    <ClInclude Include="Common\Bitmap.h" />\r
-    <ClInclude Include="CCPromptDlg.h" />\r
-    <ClInclude Include="charsets.h" />\r
-    <ClInclude Include="ChildFrm.h" />\r
-    <ClInclude Include="Common\ClipBoard.h" />\r
-    <ClInclude Include="Common\CMoveConstraint.h" />\r
-    <ClInclude Include="codepage_detect.h" />\r
-    <ClInclude Include="Common\ColorButton.h" />\r
-    <ClInclude Include="Common\ExConverter.h" />\r
-    <ClInclude Include="CompareEngines\BinaryCompare.h" />\r
-    <ClInclude Include="CompareOptions.h" />\r
-    <ClInclude Include="CompareStatisticsDlg.h" />\r
-    <ClInclude Include="CompareStats.h" />\r
-    <ClInclude Include="ConfigLog.h" />\r
-    <ClInclude Include="ConfirmFolderCopyDlg.h" />\r
-    <ClInclude Include="ConflictFileParser.h" />\r
-    <ClInclude Include="Common\coretools.h" />\r
-    <ClInclude Include="Common\coretypes.h" />\r
-    <ClInclude Include="Constants.h" />\r
-    <ClInclude Include="DirActions.h" />\r
-    <ClInclude Include="HexMergeView.h" />\r
-    <ClInclude Include="DropHandler.h" />\r
-    <ClInclude Include="IMergeDoc.h" />\r
-    <ClInclude Include="ImgMergeFrm.h" />\r
-    <ClInclude Include="Merge7zFormatMergePluginImpl.h" />\r
-    <ClInclude Include="Merge7zFormatRegister.h" />\r
-    <ClInclude Include="Merge7zFormatShellImpl.h" />\r
-    <ClInclude Include="MergeStatusBar.h" />\r
-    <ClInclude Include="OptionsCustomColors.h" />\r
-    <ClInclude Include="Diff3.h" />\r
-    <ClInclude Include="DiffContext.h" />\r
-    <ClInclude Include="DiffFileData.h" />\r
-    <ClInclude Include="DiffFileInfo.h" />\r
-    <ClInclude Include="DiffItem.h" />\r
-    <ClInclude Include="DiffItemList.h" />\r
-    <ClInclude Include="DiffList.h" />\r
-    <ClInclude Include="DiffTextBuffer.h" />\r
-    <ClInclude Include="DiffThread.h" />\r
-    <ClInclude Include="DiffViewBar.h" />\r
-    <ClInclude Include="DiffWrapper.h" />\r
-    <ClInclude Include="DirCmpReport.h" />\r
-    <ClInclude Include="DirCmpReportDlg.h" />\r
-    <ClInclude Include="DirColsDlg.h" />\r
-    <ClInclude Include="DirCompProgressBar.h" />\r
-    <ClInclude Include="DirDoc.h" />\r
-    <ClInclude Include="DirFrame.h" />\r
-    <ClInclude Include="DirItem.h" />\r
-    <ClInclude Include="DirReportTypes.h" />\r
-    <ClInclude Include="DirScan.h" />\r
-    <ClInclude Include="DirTravel.h" />\r
-    <ClInclude Include="DirView.h" />\r
-    <ClInclude Include="DirViewColItems.h" />\r
-    <ClInclude Include="dllpstub.h" />\r
-    <ClInclude Include="EditorFilepathBar.h" />\r
-    <ClInclude Include="EncodingErrorBar.h" />\r
-    <ClInclude Include="Environment.h" />\r
-    <ClInclude Include="Exceptions.h" />\r
-    <ClInclude Include="FileActionScript.h" />\r
-    <ClInclude Include="FileFilter.h" />\r
-    <ClInclude Include="FileFilterHelper.h" />\r
-    <ClInclude Include="FileFilterMgr.h" />\r
-    <ClInclude Include="FileFiltersDlg.h" />\r
-    <ClInclude Include="FileLocation.h" />\r
-    <ClInclude Include="FileOrFolderSelect.h" />\r
-    <ClInclude Include="FilepathEdit.h" />\r
-    <ClInclude Include="files.h" />\r
-    <ClInclude Include="FileTextEncoding.h" />\r
-    <ClInclude Include="FileTextStats.h" />\r
-    <ClInclude Include="FileTransform.h" />\r
-    <ClInclude Include="FileVersion.h" />\r
-    <ClInclude Include="FilterCommentsManager.h" />\r
-    <ClInclude Include="FilterList.h" />\r
-    <ClInclude Include="FolderCmp.h" />\r
-    <ClInclude Include="GhostTextBuffer.h" />\r
-    <ClInclude Include="GhostTextView.h" />\r
-    <ClInclude Include="HexMergeDoc.h" />\r
-    <ClInclude Include="HexMergeFrm.h" />\r
-    <ClInclude Include="IAbortable.h" />\r
-    <ClInclude Include="IListCtrlImpl.h" />\r
-    <ClInclude Include="IntToIntMap.h" />\r
-    <ClInclude Include="IOptionsPanel.h" />\r
-    <ClInclude Include="Common\LanguageSelect.h" />\r
-    <ClInclude Include="JumpList.h" />\r
-    <ClInclude Include="LineFiltersDlg.h" />\r
-    <ClInclude Include="LineFiltersList.h" />\r
-    <ClInclude Include="LoadSaveCodepageDlg.h" />\r
-    <ClInclude Include="locality.h" />\r
-    <ClInclude Include="LocationBar.h" />\r
-    <ClInclude Include="LocationView.h" />\r
-    <ClInclude Include="Common\lwdisp.h" />\r
-    <ClInclude Include="MainFrm.h" />\r
-    <ClInclude Include="markdown.h" />\r
-    <ClInclude Include="Common\MDITabBar.h" />\r
-    <ClInclude Include="Common\memdc.h" />\r
-    <ClInclude Include="Merge.h" />\r
-    <ClInclude Include="MergeApp.h" />\r
-    <ClInclude Include="MergeCmdLineInfo.h" />\r
-    <ClInclude Include="MergeDoc.h" />\r
-    <ClInclude Include="MergeEditStatus.h" />\r
-    <ClInclude Include="MergeEditView.h" />\r
-    <ClInclude Include="MergeLineFlags.h" />\r
-    <ClInclude Include="Common\MessageBoxDialog.h" />\r
-    <ClInclude Include="MovedLines.h" />\r
-    <ClInclude Include="Common\multiformatText.h" />\r
-    <ClInclude Include="OpenDoc.h" />\r
-    <ClInclude Include="OpenFrm.h" />\r
-    <ClInclude Include="OpenView.h" />\r
-    <ClInclude Include="OptionsDef.h" />\r
-    <ClInclude Include="common\OptionsMgr.h" />\r
-    <ClInclude Include="OptionsDiffColors.h" />\r
-    <ClInclude Include="OptionsDiffOptions.h" />\r
-    <ClInclude Include="OptionsFont.h" />\r
-    <ClInclude Include="OptionsInit.h" />\r
-    <ClInclude Include="OptionsPanel.h" />\r
-    <ClInclude Include="OptionsSyntaxColors.h" />\r
-    <ClInclude Include="PatchDlg.h" />\r
-    <ClInclude Include="PatchHTML.h" />\r
-    <ClInclude Include="PatchTool.h" />\r
-    <ClInclude Include="PathContext.h" />\r
-    <ClInclude Include="paths.h" />\r
-    <ClInclude Include="Common\Picture.h" />\r
-    <ClInclude Include="Common\PidlContainer.h" />\r
-    <ClInclude Include="PluginManager.h" />\r
-    <ClInclude Include="Plugins.h" />\r
-    <ClInclude Include="PluginsListDlg.h" />\r
-    <ClInclude Include="Common\PreferencesDlg.h" />\r
-    <ClInclude Include="ProjectFile.h" />\r
-    <ClInclude Include="ProjectFilePathsDlg.h" />\r
-    <ClInclude Include="PropArchive.h" />\r
-    <ClInclude Include="PropBackups.h" />\r
-    <ClInclude Include="PropCodepage.h" />\r
-    <ClInclude Include="PropColors.h" />\r
-    <ClInclude Include="PropCompare.h" />\r
-    <ClInclude Include="PropCompareBinary.h" />\r
-    <ClInclude Include="PropCompareFolder.h" />\r
-    <ClInclude Include="PropCompareImage.h" />\r
-    <ClInclude Include="PropEditor.h" />\r
-    <ClInclude Include="Common\PropertyPageHost.h" />\r
-    <ClInclude Include="PropGeneral.h" />\r
-    <ClInclude Include="PropMarkerColors.h" />\r
-    <ClInclude Include="PropRegistry.h" />\r
-    <ClInclude Include="PropShell.h" />\r
-    <ClInclude Include="PropSyntaxColors.h" />\r
-    <ClInclude Include="PropTextColors.h" />\r
-    <ClInclude Include="PropVss.h" />\r
-    <ClInclude Include="Common\RegKey.h" />\r
-    <ClInclude Include="Common\RegOptionsMgr.h" />\r
-    <ClInclude Include="Resource.h" />\r
-    <ClInclude Include="SaveClosingDlg.h" />\r
-    <ClInclude Include="Common\scbarcf.h" />\r
-    <ClInclude Include="Common\scbarg.h" />\r
-    <ClInclude Include="SelectUnpackerDlg.h" />\r
-    <ClInclude Include="SharedFilterDlg.h" />\r
-    <ClInclude Include="Common\ShellContextMenu.h" />\r
-    <ClInclude Include="Common\ShellFileOperations.h" />\r
-    <ClInclude Include="Common\sizecbar.h" />\r
-    <ClInclude Include="Common\SortHeaderCtrl.h" />\r
-    <ClInclude Include="Common\SplitterWndEx.h" />\r
-    <ClInclude Include="SourceControl.h" />\r
-    <ClInclude Include="ssapi.h" />\r
-    <ClInclude Include="StdAfx.h" />\r
-    <ClInclude Include="stringdiffs.h" />\r
-    <ClInclude Include="stringdiffsi.h" />\r
-    <ClInclude Include="Common\SuperComboBox.h" />\r
-    <ClInclude Include="TempFile.h" />\r
-    <ClInclude Include="TestMain.h" />\r
-    <ClInclude Include="TestFilterDlg.h" />\r
-    <ClInclude Include="Common\unicoder.h" />\r
-    <ClInclude Include="Common\UnicodeString.h" />\r
-    <ClInclude Include="Common\UniFile.h" />\r
-    <ClInclude Include="TrDialogs.h" />\r
-    <ClInclude Include="UniMarkdownFile.h" />\r
-    <ClInclude Include="Common\varprop.h" />\r
-    <ClInclude Include="Common\version.h" />\r
-    <ClInclude Include="VSSHelper.h" />\r
-    <ClInclude Include="VssPromptDlg.h" />\r
-    <ClInclude Include="WMGotoDlg.h" />\r
-    <ClInclude Include="diffutils\lib\cmpbuf.h" />\r
-    <ClInclude Include="diffutils\config.h" />\r
-    <ClInclude Include="diffutils\src\diff.h" />\r
-    <ClInclude Include="diffutils\src\system.h" />\r
-    <ClInclude Include="CompareEngines\ByteComparator.h" />\r
-    <ClInclude Include="CompareEngines\ByteCompare.h" />\r
-    <ClInclude Include="CompareEngines\DiffUtils.h" />\r
-    <ClInclude Include="CompareEngines\TimeSizeCompare.h" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <None Include="..\Externals\crystaledit\editlib\ccrystaleditview.inl" />\r
-    <None Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.inl" />\r
-    <None Include="..\Externals\crystaledit\editlib\ccrystaltextview.inl" />\r
-    <None Include="..\Externals\crystaledit\editlib\filesup.inl" />\r
-    <None Include="..\Externals\crystaledit\editlib\memcombo.inl" />\r
-    <None Include="res\binarydiff.ico" />\r
-    <None Include="res\both.bmp" />\r
-    <None Include="res\equalbinary.ico" />\r
-    <None Include="res\equalfile.ico" />\r
-    <None Include="res\error.ico" />\r
-    <None Include="res\fileskip.ico" />\r
-    <None Include="res\folder.ico" />\r
-    <None Include="res\folderskip.ico" />\r
-    <None Include="res\folderup.ico" />\r
-    <None Include="res\folderup_disable.ico" />\r
-    <None Include="res\hand.cur" />\r
-    <None Include="res\left.bmp" />\r
-    <None Include="res\left_to_browse.bmp" />\r
-    <None Include="res\left_to_right.bmp" />\r
-    <None Include="res\lfile.ico" />\r
-    <None Include="res\lfolder.ico" />\r
-    <None Include="res\Merge.ico" />\r
-    <None Include="res\Merge.rc2" />\r
-    <None Include="res\MergeDir.ico" />\r
-    <None Include="res\MergeDoc.ico" />\r
-    <None Include="res\MergeProject.ico" />\r
-    <None Include="res\mg_cur.cur" />\r
-    <None Include="res\move_left_to_browse.bmp" />\r
-    <None Include="res\move_right_to_browse.bmp" />\r
-    <None Include="res\notequalfile.ico" />\r
-    <None Include="res\rfile.ico" />\r
-    <None Include="res\rfolder.ico" />\r
-    <None Include="res\right.bmp" />\r
-    <None Include="res\right_to_browse.bmp" />\r
-    <None Include="res\right_to_left.bmp" />\r
-    <None Include="res\sigma.ico" />\r
-    <None Include="CHANGELO" />\r
-    <None Include="..\Docs\Users\ChangeLog.txt" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <ResourceCompile Include="Merge.rc" />\r
-  </ItemGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
-  <ImportGroup Label="ExtensionTargets">\r
-  </ImportGroup>\r
-  <ProjectExtensions>\r
-    <VisualStudio>\r
-      <UserProperties RESOURCE_FILE="Merge.rc" />\r
-    </VisualStudio>\r
-  </ProjectExtensions>\r
-</Project>
\ No newline at end of file
diff --git a/Src/Merge.vcxproj.filters b/Src/Merge.vcxproj.filters
deleted file mode 100644 (file)
index a6168b3..0000000
--- a/Src/Merge.vcxproj.filters
+++ /dev/null
@@ -1,1544 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <ItemGroup>\r
-    <Filter Include="Source Files">\r
-      <UniqueIdentifier>{e8f63c02-8bf9-425d-88d0-831ca188bbdf}</UniqueIdentifier>\r
-      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>\r
-    </Filter>\r
-    <Filter Include="Header Files">\r
-      <UniqueIdentifier>{ff78af1d-3eee-4c01-8be1-27cf73dfe922}</UniqueIdentifier>\r
-      <Extensions>h;hpp;hxx;hm;inl</Extensions>\r
-    </Filter>\r
-    <Filter Include="Resource Files">\r
-      <UniqueIdentifier>{4e04f59d-bb70-4e67-a8d7-2b01fb6d0cd8}</UniqueIdentifier>\r
-      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>\r
-    </Filter>\r
-    <Filter Include="EditLib">\r
-      <UniqueIdentifier>{84d4664c-e7ea-4d24-8d55-b1303c40b7f4}</UniqueIdentifier>\r
-    </Filter>\r
-    <Filter Include="DiffEngine">\r
-      <UniqueIdentifier>{16e1af2b-75c9-4deb-b49f-819018df0478}</UniqueIdentifier>\r
-    </Filter>\r
-    <Filter Include="ChangeLogs">\r
-      <UniqueIdentifier>{aefb7247-d6e5-411d-9cc5-4a12f5efda4a}</UniqueIdentifier>\r
-    </Filter>\r
-    <Filter Include="Compare Engines">\r
-      <UniqueIdentifier>{b889169f-de55-4db7-ad06-423f6438fa90}</UniqueIdentifier>\r
-      <Extensions>cpp;c;h</Extensions>\r
-    </Filter>\r
-    <Filter Include="EditLib\parsers">\r
-      <UniqueIdentifier>{740d4dd9-ab31-47b8-9cbb-8e6a7b5db4fe}</UniqueIdentifier>\r
-    </Filter>\r
-    <Filter Include="MFCGui">\r
-      <UniqueIdentifier>{caf52667-921a-47aa-84a3-f277aac15107}</UniqueIdentifier>\r
-    </Filter>\r
-    <Filter Include="MFCGui\Source Files">\r
-      <UniqueIdentifier>{5dc3ba0d-6755-48f8-ad11-df56b167b514}</UniqueIdentifier>\r
-    </Filter>\r
-    <Filter Include="MFCGui\Header Files">\r
-      <UniqueIdentifier>{10ce7aff-bcfd-4ed0-98c3-766226c4c89e}</UniqueIdentifier>\r
-    </Filter>\r
-    <Filter Include="MFCGui\Dialogs">\r
-      <UniqueIdentifier>{d520b3a7-c530-4053-8766-07c26ed85f85}</UniqueIdentifier>\r
-    </Filter>\r
-    <Filter Include="MFCGui\Dialogs\PropertyPages">\r
-      <UniqueIdentifier>{c6b39fdf-7c68-42c3-895b-da25bb6e51b4}</UniqueIdentifier>\r
-    </Filter>\r
-    <Filter Include="MFCGui\Common">\r
-      <UniqueIdentifier>{297182f0-e39d-4ac4-9df3-315882ce9e07}</UniqueIdentifier>\r
-    </Filter>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <ClCompile Include="charsets.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="codepage_detect.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="CompareOptions.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="CompareStats.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="ConfigLog.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="ConflictFileParser.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="Common\coretools.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="DiffContext.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="DiffFileData.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="DiffFileInfo.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="DiffItem.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="DiffItemList.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="DiffList.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="DiffThread.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="DiffWrapper.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="DirCmpReport.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="DirItem.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="DirScan.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="DirTravel.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="dllpstub.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="Environment.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="FileFilter.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="FileFilterHelper.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="FileFilterMgr.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="FileTextEncoding.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="FileTransform.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="FileVersion.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="FilterCommentsManager.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="FilterList.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="FolderCmp.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="locality.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="Common\lwdisp.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="markdown.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="MergeCmdLineInfo.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="MovedBlocks.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="MovedLines.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="Common\multiformatText.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="OptionsInit.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="common\OptionsMgr.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="PatchHTML.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="PathContext.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="paths.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="Common\PidlContainer.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="PluginManager.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="Plugins.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="ProjectFile.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="Common\RegKey.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="Common\RegOptionsMgr.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="Common\ShellFileOperations.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="stringdiffs.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="TempFile.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="Common\unicoder.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="Common\UnicodeString.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="Common\UniFile.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="UniMarkdownFile.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="Common\varprop.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="Common\version.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="VSSHelper.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="diffutils\src\analyze.c">\r
-      <Filter>DiffEngine</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="diffutils\lib\cmpbuf.c">\r
-      <Filter>DiffEngine</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="diffutils\src\context.c">\r
-      <Filter>DiffEngine</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="diffutils\src\Diff.cpp">\r
-      <Filter>DiffEngine</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="diffutils\src\ed.c">\r
-      <Filter>DiffEngine</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="diffutils\GnuVersion.c">\r
-      <Filter>DiffEngine</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="diffutils\src\ifdef.c">\r
-      <Filter>DiffEngine</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="diffutils\src\io.c">\r
-      <Filter>DiffEngine</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="diffutils\src\normal.c">\r
-      <Filter>DiffEngine</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="diffutils\src\side.c">\r
-      <Filter>DiffEngine</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="diffutils\src\util.c">\r
-      <Filter>DiffEngine</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="CompareEngines\ByteComparator.cpp">\r
-      <Filter>Compare Engines</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="CompareEngines\ByteCompare.cpp">\r
-      <Filter>Compare Engines</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="CompareEngines\DiffUtils.cpp">\r
-      <Filter>Compare Engines</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="CompareEngines\TimeSizeCompare.cpp">\r
-      <Filter>Compare Engines</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaleditview.cpp">\r
-      <Filter>EditLib</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.cpp">\r
-      <Filter>EditLib</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview.cpp">\r
-      <Filter>EditLib</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview2.cpp">\r
-      <Filter>EditLib</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\ceditreplacedlg.cpp">\r
-      <Filter>EditLib</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\LineInfo.cpp">\r
-      <Filter>EditLib</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\SyntaxColors.cpp">\r
-      <Filter>EditLib</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\UndoRecord.cpp">\r
-      <Filter>EditLib</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\ViewableWhitespace.cpp">\r
-      <Filter>EditLib</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\cfindtextdlg.cpp">\r
-      <Filter>EditLib</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\chcondlg.cpp">\r
-      <Filter>EditLib</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\crystaleditviewex.cpp">\r
-      <Filter>EditLib</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\crystalparser.cpp">\r
-      <Filter>EditLib</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\crystaltextblock.cpp">\r
-      <Filter>EditLib</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\cs2cs.cpp">\r
-      <Filter>EditLib</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\filesup.cpp">\r
-      <Filter>EditLib</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\fpattern.cpp">\r
-      <Filter>EditLib</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\gotodlg.cpp">\r
-      <Filter>EditLib</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\memcombo.cpp">\r
-      <Filter>EditLib</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\registry.cpp">\r
-      <Filter>EditLib</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\statbar.cpp">\r
-      <Filter>EditLib</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\string_util.cpp">\r
-      <Filter>EditLib</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\batch.cpp">\r
-      <Filter>EditLib\parsers</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\asp.cpp">\r
-      <Filter>EditLib\parsers</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\basic.cpp">\r
-      <Filter>EditLib\parsers</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\cplusplus.cpp">\r
-      <Filter>EditLib\parsers</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\csharp.cpp">\r
-      <Filter>EditLib\parsers</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\css.cpp">\r
-      <Filter>EditLib\parsers</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\dcl.cpp">\r
-      <Filter>EditLib\parsers</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\fortran.cpp">\r
-      <Filter>EditLib\parsers</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\html.cpp">\r
-      <Filter>EditLib\parsers</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\ini.cpp">\r
-      <Filter>EditLib\parsers</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\innosetup.cpp">\r
-      <Filter>EditLib\parsers</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\java.cpp">\r
-      <Filter>EditLib\parsers</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\is.cpp">\r
-      <Filter>EditLib\parsers</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\lisp.cpp">\r
-      <Filter>EditLib\parsers</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\nsis.cpp">\r
-      <Filter>EditLib\parsers</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\perl.cpp">\r
-      <Filter>EditLib\parsers</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\pascal.cpp">\r
-      <Filter>EditLib\parsers</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\php.cpp">\r
-      <Filter>EditLib\parsers</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\po.cpp">\r
-      <Filter>EditLib\parsers</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\powershell.cpp">\r
-      <Filter>EditLib\parsers</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\python.cpp">\r
-      <Filter>EditLib\parsers</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\rexx.cpp">\r
-      <Filter>EditLib\parsers</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\rsrc.cpp">\r
-      <Filter>EditLib\parsers</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\sgml.cpp">\r
-      <Filter>EditLib\parsers</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\ruby.cpp">\r
-      <Filter>EditLib\parsers</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\sh.cpp">\r
-      <Filter>EditLib\parsers</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\siod.cpp">\r
-      <Filter>EditLib\parsers</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\sql.cpp">\r
-      <Filter>EditLib\parsers</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\tcl.cpp">\r
-      <Filter>EditLib\parsers</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\tex.cpp">\r
-      <Filter>EditLib\parsers</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\verilog.cpp">\r
-      <Filter>EditLib\parsers</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\xml.cpp">\r
-      <Filter>EditLib\parsers</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\cregexp_poco.cpp">\r
-      <Filter>EditLib</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="MergeApp.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="7zCommon.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="ChildFrm.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="Common\CMoveConstraint.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="Common\ColorButton.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="DiffTextBuffer.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="DiffViewBar.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="DirDoc.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="DirFrame.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="DirView.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="EditorFilepathBar.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="EncodingErrorBar.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="FileActionScript.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="FileOrFolderSelect.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="FilepathEdit.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="GhostTextBuffer.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="GhostTextView.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="HexMergeDoc.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="HexMergeFrm.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="HexMergeView.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="LocationBar.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="LocationView.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="MainFrm.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="Merge.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="MergeDoc.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="MergeDocDiffSync.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="MergeDocEncoding.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="MergeDocLineDiffs.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="MergeEditView.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="OpenDoc.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="OpenFrm.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="OpenView.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="StdAfx.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="Common\LanguageSelect.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="Common\ExConverter.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="DirCompProgressBar.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="OptionsFont.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="OptionsSyntaxColors.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="OptionsDiffColors.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="OptionsDiffOptions.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="PropVss.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="PropArchive.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="PropBackups.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="PropCodepage.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="PropColors.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="PropCompare.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="PropCompareFolder.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="PropEditor.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="PropGeneral.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="PropRegistry.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="PropShell.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="PropSyntaxColors.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="PropTextColors.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="AboutDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="DirCmpReportDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="DirColsDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="LineFiltersDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="LoadSaveCodepageDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="PatchDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="PluginsListDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="ProjectFilePathsDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="SaveClosingDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="SelectUnpackerDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="SharedFilterDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="TestFilterDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="WMGotoDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="FileFiltersDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="CompareStatisticsDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="ConfirmFolderCopyDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="PatchTool.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="Common\SortHeaderCtrl.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="Common\PreferencesDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="JumpList.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="Common\ClipBoard.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="OptionsCustomColors.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="Merge7zFormatShellImpl.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="ImgMergeFrm.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="PropCompareImage.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="Merge7zFormatMergePluginImpl.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="LineFiltersList.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="CompareEngines\BinaryCompare.cpp">\r
-      <Filter>Compare Engines</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="PropCompareBinary.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="SourceControl.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="DirViewColItems.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="DirActions.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="DropHandler.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="OptionsDef.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="OptionsPanel.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="Common\scbarg.cpp">\r
-      <Filter>MFCGui\Common</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="Common\scbarcf.cpp">\r
-      <Filter>MFCGui\Common</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="Common\sizecbar.cpp">\r
-      <Filter>MFCGui\Common</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="Common\BCMenu.cpp">\r
-      <Filter>MFCGui\Common</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="Common\MDITabBar.cpp">\r
-      <Filter>MFCGui\Common</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="Common\MessageBoxDialog.cpp">\r
-      <Filter>MFCGui\Common</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="Common\SuperComboBox.cpp">\r
-      <Filter>MFCGui\Common</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="Common\SplitterWndEx.cpp">\r
-      <Filter>MFCGui\Common</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="Common\Bitmap.cpp">\r
-      <Filter>MFCGui\Common</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="Common\Picture.cpp">\r
-      <Filter>MFCGui\Common</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="VssPromptDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="Common\ShellContextMenu.cpp">\r
-      <Filter>MFCGui\Common</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="Common\PropertyPageHost.cpp">\r
-      <Filter>MFCGui\Common</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="CCPromptDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="TrDialogs.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="MergeStatusBar.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="Test.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="TestMain.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="diffutils\src\mystat.cpp">\r
-      <Filter>DiffEngine</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\go.cpp">\r
-      <Filter>EditLib\parsers</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\rust.cpp">\r
-      <Filter>EditLib\parsers</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="PropMarkerColors.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\ctextmarkerdlg.cpp">\r
-      <Filter>EditLib</Filter>\r
-    </ClCompile>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <ClInclude Include="charsets.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="codepage_detect.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="CompareOptions.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="CompareStats.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="ConfigLog.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="ConflictFileParser.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Common\coretools.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="DiffContext.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="DiffFileData.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="DiffFileInfo.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="DiffItem.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="DiffItemList.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="DiffList.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="DiffThread.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="DiffWrapper.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="DirCmpReport.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="DirItem.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="DirReportTypes.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="DirScan.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="DirTravel.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="dllpstub.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Environment.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Exceptions.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="FileFilter.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="FileFilterHelper.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="FileFilterMgr.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="FileLocation.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="files.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="FileTextEncoding.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="FileTextStats.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="FileTransform.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="FileVersion.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="FilterCommentsManager.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="FilterList.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="FolderCmp.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="IAbortable.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="IntToIntMap.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="LineFiltersList.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="locality.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Common\lwdisp.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="markdown.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="MergeCmdLineInfo.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="MovedLines.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Common\multiformatText.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="OptionsDef.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="common\OptionsMgr.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="PatchHTML.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="PathContext.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="paths.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Common\PidlContainer.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="PluginManager.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Plugins.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="ProjectFile.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Common\RegKey.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Common\RegOptionsMgr.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Common\ShellFileOperations.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="ssapi.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="stringdiffs.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="stringdiffsi.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="TempFile.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Common\unicoder.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Common\UnicodeString.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Common\UniFile.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="UniMarkdownFile.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Common\varprop.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Common\version.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="VSSHelper.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="diffutils\lib\cmpbuf.h">\r
-      <Filter>DiffEngine</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="diffutils\config.h">\r
-      <Filter>DiffEngine</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="diffutils\src\diff.h">\r
-      <Filter>DiffEngine</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="diffutils\src\system.h">\r
-      <Filter>DiffEngine</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="CompareEngines\ByteComparator.h">\r
-      <Filter>Compare Engines</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="CompareEngines\ByteCompare.h">\r
-      <Filter>Compare Engines</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="CompareEngines\DiffUtils.h">\r
-      <Filter>Compare Engines</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="CompareEngines\TimeSizeCompare.h">\r
-      <Filter>Compare Engines</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaleditview.h">\r
-      <Filter>EditLib</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.h">\r
-      <Filter>EditLib</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextview.h">\r
-      <Filter>EditLib</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\ceditreplacedlg.h">\r
-      <Filter>EditLib</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\LineInfo.h">\r
-      <Filter>EditLib</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\SyntaxColors.h">\r
-      <Filter>EditLib</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\UndoRecord.h">\r
-      <Filter>EditLib</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\ViewableWhitespace.h">\r
-      <Filter>EditLib</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\cfindtextdlg.h">\r
-      <Filter>EditLib</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\chcondlg.h">\r
-      <Filter>EditLib</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\cregexp.h">\r
-      <Filter>EditLib</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\crystaleditviewex.h">\r
-      <Filter>EditLib</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\crystalparser.h">\r
-      <Filter>EditLib</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\crystaltextblock.h">\r
-      <Filter>EditLib</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\cs2cs.h">\r
-      <Filter>EditLib</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\editcmd.h">\r
-      <Filter>EditLib</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\editreg.h">\r
-      <Filter>EditLib</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\edtlib.h">\r
-      <Filter>EditLib</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\filesup.h">\r
-      <Filter>EditLib</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\fpattern.h">\r
-      <Filter>EditLib</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\gotodlg.h">\r
-      <Filter>EditLib</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\memcombo.h">\r
-      <Filter>EditLib</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\registry.h">\r
-      <Filter>EditLib</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\statbar.h">\r
-      <Filter>EditLib</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\string_util.h">\r
-      <Filter>EditLib</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\wispelld.h">\r
-      <Filter>EditLib</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="StdAfx.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Resource.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="OpenFrm.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="OpenView.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="OpenDoc.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="MergeEditView.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="MergeEditStatus.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="MergeDoc.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Merge.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="MainFrm.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="LocationView.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="LocationBar.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="IOptionsPanel.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="HexMergeFrm.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="HexMergeDoc.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="GhostTextView.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="GhostTextBuffer.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="FileOrFolderSelect.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="ChildFrm.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="DiffViewBar.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="DiffTextBuffer.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="DirDoc.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="DirFrame.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="DirView.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="EditorFilepathBar.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="EncodingErrorBar.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="FileActionScript.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="FilepathEdit.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Common\LanguageSelect.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Common\coretypes.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="IListCtrlImpl.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="MergeLineFlags.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="MergeApp.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Common\ExConverter.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="DirCompProgressBar.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Diff3.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="OptionsFont.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="OptionsSyntaxColors.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="OptionsDiffColors.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="OptionsDiffOptions.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="PropArchive.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="PropVss.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="PropBackups.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="PropCodepage.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="PropColors.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="PropCompare.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="PropCompareFolder.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="PropEditor.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="PropGeneral.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="PropRegistry.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="PropShell.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="PropSyntaxColors.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="PropTextColors.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="AboutDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="CompareStatisticsDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="ConfirmFolderCopyDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="DirCmpReportDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="FileFiltersDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="LoadSaveCodepageDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="LineFiltersDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="PatchDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="PluginsListDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="SaveClosingDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="SelectUnpackerDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="SharedFilterDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="TestFilterDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="WMGotoDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="ProjectFilePathsDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="DirColsDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="PatchTool.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Common\PreferencesDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="JumpList.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Common\ClipBoard.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="OptionsCustomColors.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="7zCommon.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Merge7zFormatShellImpl.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="ImgMergeFrm.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="PropCompareImage.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="IMergeDoc.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Merge7zFormatMergePluginImpl.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Merge7zFormatRegister.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="CompareEngines\BinaryCompare.h">\r
-      <Filter>Compare Engines</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="DirViewColItems.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="DirActions.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="HexMergeView.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="PropCompareBinary.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="CCPromptDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="VssPromptDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Common\SuperComboBox.h">\r
-      <Filter>MFCGui\Common</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Common\SortHeaderCtrl.h">\r
-      <Filter>MFCGui\Common</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Common\CMoveConstraint.h">\r
-      <Filter>MFCGui\Common</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Common\MDITabBar.h">\r
-      <Filter>MFCGui\Common</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Common\PropertyPageHost.h">\r
-      <Filter>MFCGui\Common</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Common\SplitterWndEx.h">\r
-      <Filter>MFCGui\Common</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Common\sizecbar.h">\r
-      <Filter>MFCGui\Common</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Common\scbarg.h">\r
-      <Filter>MFCGui\Common</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Common\scbarcf.h">\r
-      <Filter>MFCGui\Common</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Common\MessageBoxDialog.h">\r
-      <Filter>MFCGui\Common</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="OptionsPanel.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Common\Bitmap.h">\r
-      <Filter>MFCGui\Common</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Common\memdc.h">\r
-      <Filter>MFCGui\Common</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Common\ShellContextMenu.h">\r
-      <Filter>MFCGui\Common</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Common\BCMenu.h">\r
-      <Filter>MFCGui\Common</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Common\ColorButton.h">\r
-      <Filter>MFCGui\Common</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Common\Picture.h">\r
-      <Filter>MFCGui\Common</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="DropHandler.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Constants.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="SourceControl.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="OptionsInit.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="TrDialogs.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="MergeStatusBar.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="TestMain.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.h">\r
-      <Filter>EditLib</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="PropMarkerColors.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\ctextmarkerdlg.h">\r
-      <Filter>EditLib</Filter>\r
-    </ClInclude>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <None Include="res\binarydiff.ico">\r
-      <Filter>Resource Files</Filter>\r
-    </None>\r
-    <None Include="res\both.bmp">\r
-      <Filter>Resource Files</Filter>\r
-    </None>\r
-    <None Include="res\equalbinary.ico">\r
-      <Filter>Resource Files</Filter>\r
-    </None>\r
-    <None Include="res\equalfile.ico">\r
-      <Filter>Resource Files</Filter>\r
-    </None>\r
-    <None Include="res\error.ico">\r
-      <Filter>Resource Files</Filter>\r
-    </None>\r
-    <None Include="res\fileskip.ico">\r
-      <Filter>Resource Files</Filter>\r
-    </None>\r
-    <None Include="res\folder.ico">\r
-      <Filter>Resource Files</Filter>\r
-    </None>\r
-    <None Include="res\folderskip.ico">\r
-      <Filter>Resource Files</Filter>\r
-    </None>\r
-    <None Include="res\folderup.ico">\r
-      <Filter>Resource Files</Filter>\r
-    </None>\r
-    <None Include="res\folderup_disable.ico">\r
-      <Filter>Resource Files</Filter>\r
-    </None>\r
-    <None Include="res\hand.cur">\r
-      <Filter>Resource Files</Filter>\r
-    </None>\r
-    <None Include="res\left.bmp">\r
-      <Filter>Resource Files</Filter>\r
-    </None>\r
-    <None Include="res\left_to_browse.bmp">\r
-      <Filter>Resource Files</Filter>\r
-    </None>\r
-    <None Include="res\left_to_right.bmp">\r
-      <Filter>Resource Files</Filter>\r
-    </None>\r
-    <None Include="res\lfile.ico">\r
-      <Filter>Resource Files</Filter>\r
-    </None>\r
-    <None Include="res\lfolder.ico">\r
-      <Filter>Resource Files</Filter>\r
-    </None>\r
-    <None Include="res\Merge.ico">\r
-      <Filter>Resource Files</Filter>\r
-    </None>\r
-    <None Include="res\Merge.rc2">\r
-      <Filter>Resource Files</Filter>\r
-    </None>\r
-    <None Include="res\MergeDir.ico">\r
-      <Filter>Resource Files</Filter>\r
-    </None>\r
-    <None Include="res\MergeDoc.ico">\r
-      <Filter>Resource Files</Filter>\r
-    </None>\r
-    <None Include="res\MergeProject.ico">\r
-      <Filter>Resource Files</Filter>\r
-    </None>\r
-    <None Include="res\mg_cur.cur">\r
-      <Filter>Resource Files</Filter>\r
-    </None>\r
-    <None Include="res\move_left_to_browse.bmp">\r
-      <Filter>Resource Files</Filter>\r
-    </None>\r
-    <None Include="res\move_right_to_browse.bmp">\r
-      <Filter>Resource Files</Filter>\r
-    </None>\r
-    <None Include="res\notequalfile.ico">\r
-      <Filter>Resource Files</Filter>\r
-    </None>\r
-    <None Include="res\rfile.ico">\r
-      <Filter>Resource Files</Filter>\r
-    </None>\r
-    <None Include="res\rfolder.ico">\r
-      <Filter>Resource Files</Filter>\r
-    </None>\r
-    <None Include="res\right.bmp">\r
-      <Filter>Resource Files</Filter>\r
-    </None>\r
-    <None Include="res\right_to_browse.bmp">\r
-      <Filter>Resource Files</Filter>\r
-    </None>\r
-    <None Include="res\right_to_left.bmp">\r
-      <Filter>Resource Files</Filter>\r
-    </None>\r
-    <None Include="res\sigma.ico">\r
-      <Filter>Resource Files</Filter>\r
-    </None>\r
-    <None Include="CHANGELO">\r
-      <Filter>ChangeLogs</Filter>\r
-    </None>\r
-    <None Include="..\Docs\Users\ChangeLog.txt">\r
-      <Filter>ChangeLogs</Filter>\r
-    </None>\r
-    <None Include="..\Externals\crystaledit\editlib\ccrystaleditview.inl">\r
-      <Filter>EditLib</Filter>\r
-    </None>\r
-    <None Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.inl">\r
-      <Filter>EditLib</Filter>\r
-    </None>\r
-    <None Include="..\Externals\crystaledit\editlib\ccrystaltextview.inl">\r
-      <Filter>EditLib</Filter>\r
-    </None>\r
-    <None Include="..\Externals\crystaledit\editlib\filesup.inl">\r
-      <Filter>EditLib</Filter>\r
-    </None>\r
-    <None Include="..\Externals\crystaledit\editlib\memcombo.inl">\r
-      <Filter>EditLib</Filter>\r
-    </None>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <ResourceCompile Include="Merge.rc">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ResourceCompile>\r
-  </ItemGroup>\r
-</Project>
\ No newline at end of file
diff --git a/Src/Merge.vs2015.vcxproj b/Src/Merge.vs2015.vcxproj
index 11602d4..1be97ce 100644 (file)
--- a/Src/Merge.vs2015.vcxproj
+++ b/Src/Merge.vs2015.vcxproj
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Test|Win32">\r
+      <Configuration>Test</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Test|x64">\r
+      <Configuration>Test</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
     <ProjectConfiguration Include="UnicodeDebug|Win32">\r
       <Configuration>UnicodeDebug</Configuration>\r
       <Platform>Win32</Platform>\r
@@ -31,6 +39,12 @@
     <CharacterSet>Unicode</CharacterSet>\r
     <PlatformToolset>v140_xp</PlatformToolset>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|Win32'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseOfMfc>Static</UseOfMfc>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+    <PlatformToolset>v140_xp</PlatformToolset>\r
+  </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'" Label="Configuration">\r
     <ConfigurationType>Application</ConfigurationType>\r
     <UseOfMfc>Static</UseOfMfc>\r
@@ -43,6 +57,12 @@
     <CharacterSet>Unicode</CharacterSet>\r
     <PlatformToolset>v140_xp</PlatformToolset>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|x64'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseOfMfc>Static</UseOfMfc>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+    <PlatformToolset>v140_xp</PlatformToolset>\r
+  </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'" Label="Configuration">\r
     <ConfigurationType>Application</ConfigurationType>\r
     <UseOfMfc>Static</UseOfMfc>\r
@@ -55,12 +75,18 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
   </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Test|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
   </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Test|x64'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
   </ImportGroup>\r
@@ -75,15 +101,24 @@
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">false</LinkIncremental>\r
     <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">true</EmbedManifest>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">.\..\Build\Merge$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">.\..\Build\Merge$(Configuration)\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">.\..\BuildTmp\Merge$(Configuration)\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">.\..\BuildTmp\Merge$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</LinkIncremental>\r
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">true</LinkIncremental>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">.\..\Build\$(Platform)\Merge$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Test|x64'">.\..\Build\$(Platform)\Merge$(Configuration)\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">.\..\BuildTmp\$(Platform)\Merge$(Configuration)\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Test|x64'">.\..\BuildTmp\$(Platform)\Merge$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">true</LinkIncremental>\r
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Test|x64'">true</LinkIncremental>\r
     <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">true</EmbedManifest>\r
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Test|x64'">true</EmbedManifest>\r
     <TargetName Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">Win$(ProjectName)U</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Test|x64'">Win$(ProjectName)U</TargetName>\r
     <TargetName Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">Win$(ProjectName)U</TargetName>\r
     <TargetName Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Win$(ProjectName)U</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">Win$(ProjectName)U</TargetName>\r
     <TargetName Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">Win$(ProjectName)U</TargetName>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">\r
@@ -100,7 +135,7 @@
       <Optimization>MinSpace</Optimization>\r
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
       <AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>WIN32;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>WINVER=0x0501;WIN32;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
@@ -159,7 +194,7 @@
       <Optimization>MinSpace</Optimization>\r
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
       <AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>WIN64;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>WINVER=0x0501;WIN64;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
@@ -213,7 +248,7 @@
       <AdditionalOptions>/EHa  %(AdditionalOptions)</AdditionalOptions>\r
       <Optimization>Disabled</Optimization>\r
       <AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>WINVER=0x0501;_DEBUG;WIN32;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\r
       <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
       <PrecompiledHeader>Use</PrecompiledHeader>\r
@@ -251,6 +286,57 @@
       </Command>\r
     </PostBuildEvent>\r
   </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">\r
+    <Midl>\r
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <MkTypLibCompatible>true</MkTypLibCompatible>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <TargetEnvironment>Win32</TargetEnvironment>\r
+      <HeaderFileName>\r
+      </HeaderFileName>\r
+    </Midl>\r
+    <ClCompile>\r
+      <AdditionalOptions>/EHa  %(AdditionalOptions)</AdditionalOptions>\r
+      <Optimization>Disabled</Optimization>\r
+      <AdditionalIncludeDirectories>.;..\Externals\gtest;..\Externals\gtest\include;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>TEST_WINMERGE;WINVER=0x0501;_DEBUG;WIN32;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\r
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
+      <CompileAs>Default</CompileAs>\r
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+      <ExceptionHandling>Async</ExceptionHandling>\r
+    </ClCompile>\r
+    <ResourceCompile>\r
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <Culture>0x0409</Culture>\r
+    </ResourceCompile>\r
+    <Link>\r
+      <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <OutputFile>$(OutDir)/WinMergeU.exe</OutputFile>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <AdditionalLibraryDirectories>..\Externals\poco\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Console</SubSystem>\r
+      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>\r
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
+      <DataExecutionPrevention>\r
+      </DataExecutionPrevention>\r
+      <TargetMachine>MachineX86</TargetMachine>\r
+      <GenerateMapFile>true</GenerateMapFile>\r
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>\r
+    </Link>\r
+    <PostBuildEvent>\r
+      <Command>\r
+      </Command>\r
+    </PostBuildEvent>\r
+  </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">\r
     <CustomBuildStep>\r
       <Command>\r
@@ -269,7 +355,7 @@
       <AdditionalOptions>/EHa  %(AdditionalOptions)</AdditionalOptions>\r
       <Optimization>Disabled</Optimization>\r
       <AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>WINVER=0x0501;_DEBUG;WIN64;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\r
       <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
       <PrecompiledHeader>Use</PrecompiledHeader>\r
@@ -307,6 +393,62 @@
       </Command>\r
     </PostBuildEvent>\r
   </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Test|x64'">\r
+    <CustomBuildStep>\r
+      <Command>\r
+      </Command>\r
+      <Outputs>$(TargetDir)WinMergeU.map;%(Outputs)</Outputs>\r
+    </CustomBuildStep>\r
+    <Midl>\r
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <MkTypLibCompatible>true</MkTypLibCompatible>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <TargetEnvironment>X64</TargetEnvironment>\r
+      <HeaderFileName>\r
+      </HeaderFileName>\r
+    </Midl>\r
+    <ClCompile>\r
+      <AdditionalOptions>/EHa  %(AdditionalOptions)</AdditionalOptions>\r
+      <Optimization>Disabled</Optimization>\r
+      <AdditionalIncludeDirectories>.;..\Externals\gtest;..\Externals\gtest\include;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>TEST_WINMERGE;WINVER=0x0501;_DEBUG;WIN64;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\r
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
+      <CompileAs>Default</CompileAs>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+      <ExceptionHandling>Async</ExceptionHandling>\r
+    </ClCompile>\r
+    <ResourceCompile>\r
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <Culture>0x0409</Culture>\r
+    </ResourceCompile>\r
+    <Link>\r
+      <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <OutputFile>$(OutDir)/WinMergeU.exe</OutputFile>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <AdditionalLibraryDirectories>..\Externals\poco\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Console</SubSystem>\r
+      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>\r
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
+      <DataExecutionPrevention>\r
+      </DataExecutionPrevention>\r
+      <TargetMachine>MachineX64</TargetMachine>\r
+      <GenerateMapFile>true</GenerateMapFile>\r
+      <Profile>false</Profile>\r
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>\r
+    </Link>\r
+    <PostBuildEvent>\r
+      <Command>\r
+      </Command>\r
+    </PostBuildEvent>\r
+  </ItemDefinitionGroup>\r
   <ItemGroup>\r
     <ClCompile Include="..\Externals\crystaledit\editlib\asp.cpp" />\r
     <ClCompile Include="..\Externals\crystaledit\editlib\basic.cpp" />\r
@@ -379,18 +521,26 @@
     </ClCompile>\r
     <ClCompile Include="charsets.c">\r
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Test|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Test|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
       <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</BrowseInformation>\r
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">true</BrowseInformation>\r
       <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">true</BrowseInformation>\r
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Test|x64'">true</BrowseInformation>\r
       <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Disabled</Optimization>\r
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">Disabled</Optimization>\r
       <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">Disabled</Optimization>\r
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Test|x64'">Disabled</Optimization>\r
       <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">MinSpace</Optimization>\r
       <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">MinSpace</Optimization>\r
     </ClCompile>\r
diff --git a/Src/Merge.vs2015.vcxproj.filters b/Src/Merge.vs2015.vcxproj.filters
index 3c58015..1153513 100644 (file)
--- a/Src/Merge.vs2015.vcxproj.filters
+++ b/Src/Merge.vs2015.vcxproj.filters
@@ -745,6 +745,12 @@
     <ClCompile Include="MergeStatusBar.cpp">\r
       <Filter>MFCGui\Source Files</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="Test.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="TestMain.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
     <ClCompile Include="diffutils\src\mystat.cpp">\r
       <Filter>DiffEngine</Filter>\r
     </ClCompile>\r
@@ -754,12 +760,6 @@
     <ClCompile Include="..\Externals\crystaledit\editlib\rust.cpp">\r
       <Filter>EditLib\parsers</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="Test.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="TestMain.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.cpp">\r
       <Filter>EditLib</Filter>\r
     </ClCompile>\r
diff --git a/Src/Merge.vs2017.vcxproj b/Src/Merge.vs2017.vcxproj
index 2320b5e..2fca43e 100644 (file)
--- a/Src/Merge.vs2017.vcxproj
+++ b/Src/Merge.vs2017.vcxproj
@@ -1,1026 +1,1176 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="UnicodeDebug|Win32">
-      <Configuration>UnicodeDebug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="UnicodeDebug|x64">
-      <Configuration>UnicodeDebug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="UnicodeRelease|Win32">
-      <Configuration>UnicodeRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="UnicodeRelease|x64">
-      <Configuration>UnicodeRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>Merge</ProjectName>
-    <ProjectGuid>{9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}</ProjectGuid>
-    <RootNamespace>Merge</RootNamespace>
-    <Keyword>MFCProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141_xp</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">.\..\Build\Merge$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">.\..\BuildTmp\Merge$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">.\..\Build\$(Platform)\Merge$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">.\..\BuildTmp\$(Platform)\Merge$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">false</LinkIncremental>
-    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">true</EmbedManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">.\..\Build\Merge$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">.\..\BuildTmp\Merge$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">.\..\Build\$(Platform)\Merge$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">.\..\BuildTmp\$(Platform)\Merge$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">true</LinkIncremental>
-    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">true</EmbedManifest>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">Win$(ProjectName)U</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">Win$(ProjectName)U</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Win$(ProjectName)U</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">Win$(ProjectName)U</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/EHa  %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>MinSpace</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <ExceptionHandling>Async</ExceptionHandling>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/verbose:lib %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)/WinMergeU.exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\Externals\poco\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>msvcrtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <GenerateMapFile>true</GenerateMapFile>
-    </Link>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">
-    <CustomBuildStep>
-      <Command>
-      </Command>
-      <Outputs>$(TargetDir)WinMergeU.map;%(Outputs)</Outputs>
-    </CustomBuildStep>
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/EHa  %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>MinSpace</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN64;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <ExceptionHandling>Async</ExceptionHandling>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/verbose:lib %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)/WinMergeU.exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\Externals\poco\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>msvcrtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-      <GenerateMapFile>true</GenerateMapFile>
-      <OptimizeReferences>
-      </OptimizeReferences>
-    </Link>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/EHa  %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <ExceptionHandling>Async</ExceptionHandling>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)/WinMergeU.exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\Externals\poco\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <GenerateMapFile>true</GenerateMapFile>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">
-    <CustomBuildStep>
-      <Command>
-      </Command>
-      <Outputs>$(TargetDir)WinMergeU.map;%(Outputs)</Outputs>
-    </CustomBuildStep>
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/EHa  %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <ExceptionHandling>Async</ExceptionHandling>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)/WinMergeU.exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\Externals\poco\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-      <GenerateMapFile>true</GenerateMapFile>
-      <Profile>false</Profile>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\Externals\crystaledit\editlib\asp.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\basic.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\batch.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaleditview.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview2.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\ceditreplacedlg.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\cfindtextdlg.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\chcondlg.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\cplusplus.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\cregexp_poco.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\crystaleditviewex.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\crystalparser.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\crystaltextblock.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\cs2cs.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\csharp.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\css.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\ctextmarkerdlg.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\dcl.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\filesup.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\fortran.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\fpattern.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\go.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\gotodlg.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\html.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\ini.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\innosetup.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\is.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\java.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\LineInfo.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\lisp.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\memcombo.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\nsis.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\pascal.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\perl.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\php.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\po.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\powershell.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\python.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\registry.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\rexx.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\rsrc.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\ruby.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\rust.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\sgml.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\sh.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\siod.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\sql.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\statbar.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\string_util.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\SyntaxColors.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\tcl.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\tex.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\UndoRecord.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\verilog.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\ViewableWhitespace.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\xml.cpp" />
-    <ClCompile Include="7zCommon.cpp">
-    </ClCompile>
-    <ClCompile Include="AboutDlg.cpp">
-    </ClCompile>
-    <ClCompile Include="Common\BCMenu.cpp" />
-    <ClCompile Include="Common\Bitmap.cpp" />
-    <ClCompile Include="CCPromptDlg.cpp">
-    </ClCompile>
-    <ClCompile Include="charsets.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</BrowseInformation>
-      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">true</BrowseInformation>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Disabled</Optimization>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">Disabled</Optimization>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">MinSpace</Optimization>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">MinSpace</Optimization>
-    </ClCompile>
-    <ClCompile Include="ChildFrm.cpp" />
-    <ClCompile Include="Common\ClipBoard.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="Common\CMoveConstraint.cpp" />
-    <ClCompile Include="codepage_detect.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="Common\ColorButton.cpp" />
-    <ClCompile Include="Common\ExConverter.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="CompareEngines\BinaryCompare.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="CompareOptions.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="CompareStatisticsDlg.cpp" />
-    <ClCompile Include="CompareStats.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="ConfigLog.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="ConfirmFolderCopyDlg.cpp" />
-    <ClCompile Include="ConflictFileParser.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="Common\coretools.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="DropHandler.cpp" />
-    <ClCompile Include="ImgMergeFrm.cpp" />
-    <ClCompile Include="Merge7zFormatMergePluginImpl.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="Merge7zFormatShellImpl.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="MergeStatusBar.cpp" />
-    <ClCompile Include="OptionsDef.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="OptionsCustomColors.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="DiffContext.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="DiffFileData.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="DiffFileInfo.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="DiffItem.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="DiffItemList.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="DiffList.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="DiffTextBuffer.cpp" />
-    <ClCompile Include="DiffThread.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="DiffViewBar.cpp" />
-    <ClCompile Include="DiffWrapper.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="DirActions.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="DirCmpReport.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="DirCmpReportDlg.cpp" />
-    <ClCompile Include="DirColsDlg.cpp" />
-    <ClCompile Include="DirCompProgressBar.cpp" />
-    <ClCompile Include="DirDoc.cpp" />
-    <ClCompile Include="DirFrame.cpp" />
-    <ClCompile Include="DirItem.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="DirScan.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="DirTravel.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="DirView.cpp" />
-    <ClCompile Include="DirViewColItems.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="dllpstub.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="EditorFilepathBar.cpp" />
-    <ClCompile Include="EncodingErrorBar.cpp" />
-    <ClCompile Include="Environment.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="FileActionScript.cpp" />
-    <ClCompile Include="FileFilter.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="FileFilterHelper.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="FileFilterMgr.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="FileFiltersDlg.cpp" />
-    <ClCompile Include="FileOrFolderSelect.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="FilepathEdit.cpp" />
-    <ClCompile Include="FileTextEncoding.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="FileTransform.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="FileVersion.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="FilterCommentsManager.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="FilterList.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="FolderCmp.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="GhostTextBuffer.cpp" />
-    <ClCompile Include="GhostTextView.cpp" />
-    <ClCompile Include="HexMergeDoc.cpp" />
-    <ClCompile Include="HexMergeFrm.cpp" />
-    <ClCompile Include="HexMergeView.cpp" />
-    <ClCompile Include="Common\LanguageSelect.cpp" />
-    <ClCompile Include="JumpList.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="LineFiltersDlg.cpp" />
-    <ClCompile Include="LineFiltersList.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="LoadSaveCodepageDlg.cpp" />
-    <ClCompile Include="locality.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="LocationBar.cpp" />
-    <ClCompile Include="LocationView.cpp" />
-    <ClCompile Include="Common\lwdisp.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="MainFrm.cpp" />
-    <ClCompile Include="markdown.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="Common\MDITabBar.cpp" />
-    <ClCompile Include="Merge.cpp" />
-    <ClCompile Include="MergeApp.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="MergeCmdLineInfo.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="MergeDoc.cpp" />
-    <ClCompile Include="MergeDocDiffSync.cpp" />
-    <ClCompile Include="MergeDocEncoding.cpp" />
-    <ClCompile Include="MergeDocLineDiffs.cpp" />
-    <ClCompile Include="MergeEditView.cpp" />
-    <ClCompile Include="Common\MessageBoxDialog.cpp" />
-    <ClCompile Include="MovedBlocks.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="MovedLines.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="Common\multiformatText.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="OpenDoc.cpp" />
-    <ClCompile Include="OpenFrm.cpp" />
-    <ClCompile Include="OpenView.cpp" />
-    <ClCompile Include="OptionsDiffColors.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="OptionsDiffOptions.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="OptionsFont.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="OptionsInit.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="common\OptionsMgr.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="OptionsPanel.cpp" />
-    <ClCompile Include="OptionsSyntaxColors.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="PatchDlg.cpp" />
-    <ClCompile Include="PatchHTML.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="PatchTool.cpp" />
-    <ClCompile Include="PathContext.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="paths.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="Common\Picture.cpp" />
-    <ClCompile Include="Common\PidlContainer.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="PluginManager.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="Plugins.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="PluginsListDlg.cpp" />
-    <ClCompile Include="Common\PreferencesDlg.cpp" />
-    <ClCompile Include="ProjectFile.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="ProjectFilePathsDlg.cpp" />
-    <ClCompile Include="PropArchive.cpp" />
-    <ClCompile Include="PropBackups.cpp" />
-    <ClCompile Include="PropCodepage.cpp" />
-    <ClCompile Include="PropColors.cpp" />
-    <ClCompile Include="PropCompare.cpp" />
-    <ClCompile Include="PropCompareBinary.cpp" />
-    <ClCompile Include="PropCompareFolder.cpp" />
-    <ClCompile Include="PropCompareImage.cpp" />
-    <ClCompile Include="PropEditor.cpp" />
-    <ClCompile Include="Common\PropertyPageHost.cpp" />
-    <ClCompile Include="PropGeneral.cpp" />
-    <ClCompile Include="PropMarkerColors.cpp" />
-    <ClCompile Include="PropRegistry.cpp" />
-    <ClCompile Include="PropShell.cpp" />
-    <ClCompile Include="PropSyntaxColors.cpp" />
-    <ClCompile Include="PropTextColors.cpp" />
-    <ClCompile Include="PropVss.cpp" />
-    <ClCompile Include="Common\RegKey.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="Common\RegOptionsMgr.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="SaveClosingDlg.cpp" />
-    <ClCompile Include="Common\scbarcf.cpp" />
-    <ClCompile Include="Common\scbarg.cpp" />
-    <ClCompile Include="SelectUnpackerDlg.cpp" />
-    <ClCompile Include="SharedFilterDlg.cpp" />
-    <ClCompile Include="Common\ShellContextMenu.cpp" />
-    <ClCompile Include="Common\ShellFileOperations.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="Common\sizecbar.cpp" />
-    <ClCompile Include="Common\SortHeaderCtrl.cpp" />
-    <ClCompile Include="SourceControl.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="Common\SplitterWndEx.cpp" />
-    <ClCompile Include="StdAfx.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="stringdiffs.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="Common\SuperComboBox.cpp" />
-    <ClCompile Include="TempFile.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="Test.cpp" />
-    <ClCompile Include="TestFilterDlg.cpp" />
-    <ClCompile Include="Common\unicoder.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="Common\UnicodeString.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="Common\UniFile.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="TestMain.cpp" />
-    <ClCompile Include="TrDialogs.cpp" />
-    <ClCompile Include="UniMarkdownFile.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="Common\varprop.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="Common\version.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="VSSHelper.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="VssPromptDlg.cpp" />
-    <ClCompile Include="WMGotoDlg.cpp" />
-    <ClCompile Include="diffutils\src\analyze.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="diffutils\lib\cmpbuf.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\context.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\Diff.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\ed.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="diffutils\GnuVersion.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\ifdef.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\io.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\normal.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\side.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\util.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\mystat.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="CompareEngines\ByteComparator.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="CompareEngines\ByteCompare.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="CompareEngines\DiffUtils.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="CompareEngines\TimeSizeCompare.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaleditview.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextview.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\ceditreplacedlg.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\cfindtextdlg.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\chcondlg.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\cregexp.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\crystaleditviewex.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\crystalparser.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\crystaltextblock.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\cs2cs.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\ctextmarkerdlg.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\editcmd.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\editreg.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\edtlib.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\filesup.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\fpattern.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\gotodlg.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\LineInfo.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\memcombo.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\registry.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\statbar.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\string_util.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\SyntaxColors.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\UndoRecord.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\ViewableWhitespace.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\wispelld.h" />
-    <ClInclude Include="7zCommon.h" />
-    <ClInclude Include="AboutDlg.h" />
-    <ClInclude Include="Common\BCMenu.h" />
-    <ClInclude Include="Common\Bitmap.h" />
-    <ClInclude Include="CCPromptDlg.h" />
-    <ClInclude Include="charsets.h" />
-    <ClInclude Include="ChildFrm.h" />
-    <ClInclude Include="Common\ClipBoard.h" />
-    <ClInclude Include="Common\CMoveConstraint.h" />
-    <ClInclude Include="codepage_detect.h" />
-    <ClInclude Include="Common\ColorButton.h" />
-    <ClInclude Include="Common\ExConverter.h" />
-    <ClInclude Include="CompareEngines\BinaryCompare.h" />
-    <ClInclude Include="CompareOptions.h" />
-    <ClInclude Include="CompareStatisticsDlg.h" />
-    <ClInclude Include="CompareStats.h" />
-    <ClInclude Include="ConfigLog.h" />
-    <ClInclude Include="ConfirmFolderCopyDlg.h" />
-    <ClInclude Include="ConflictFileParser.h" />
-    <ClInclude Include="Common\coretools.h" />
-    <ClInclude Include="Common\coretypes.h" />
-    <ClInclude Include="Constants.h" />
-    <ClInclude Include="DirActions.h" />
-    <ClInclude Include="HexMergeView.h" />
-    <ClInclude Include="DropHandler.h" />
-    <ClInclude Include="IMergeDoc.h" />
-    <ClInclude Include="ImgMergeFrm.h" />
-    <ClInclude Include="Merge7zFormatMergePluginImpl.h" />
-    <ClInclude Include="Merge7zFormatRegister.h" />
-    <ClInclude Include="Merge7zFormatShellImpl.h" />
-    <ClInclude Include="MergeStatusBar.h" />
-    <ClInclude Include="OptionsCustomColors.h" />
-    <ClInclude Include="Diff3.h" />
-    <ClInclude Include="DiffContext.h" />
-    <ClInclude Include="DiffFileData.h" />
-    <ClInclude Include="DiffFileInfo.h" />
-    <ClInclude Include="DiffItem.h" />
-    <ClInclude Include="DiffItemList.h" />
-    <ClInclude Include="DiffList.h" />
-    <ClInclude Include="DiffTextBuffer.h" />
-    <ClInclude Include="DiffThread.h" />
-    <ClInclude Include="DiffViewBar.h" />
-    <ClInclude Include="DiffWrapper.h" />
-    <ClInclude Include="DirCmpReport.h" />
-    <ClInclude Include="DirCmpReportDlg.h" />
-    <ClInclude Include="DirColsDlg.h" />
-    <ClInclude Include="DirCompProgressBar.h" />
-    <ClInclude Include="DirDoc.h" />
-    <ClInclude Include="DirFrame.h" />
-    <ClInclude Include="DirItem.h" />
-    <ClInclude Include="DirReportTypes.h" />
-    <ClInclude Include="DirScan.h" />
-    <ClInclude Include="DirTravel.h" />
-    <ClInclude Include="DirView.h" />
-    <ClInclude Include="DirViewColItems.h" />
-    <ClInclude Include="dllpstub.h" />
-    <ClInclude Include="EditorFilepathBar.h" />
-    <ClInclude Include="EncodingErrorBar.h" />
-    <ClInclude Include="Environment.h" />
-    <ClInclude Include="Exceptions.h" />
-    <ClInclude Include="FileActionScript.h" />
-    <ClInclude Include="FileFilter.h" />
-    <ClInclude Include="FileFilterHelper.h" />
-    <ClInclude Include="FileFilterMgr.h" />
-    <ClInclude Include="FileFiltersDlg.h" />
-    <ClInclude Include="FileLocation.h" />
-    <ClInclude Include="FileOrFolderSelect.h" />
-    <ClInclude Include="FilepathEdit.h" />
-    <ClInclude Include="files.h" />
-    <ClInclude Include="FileTextEncoding.h" />
-    <ClInclude Include="FileTextStats.h" />
-    <ClInclude Include="FileTransform.h" />
-    <ClInclude Include="FileVersion.h" />
-    <ClInclude Include="FilterCommentsManager.h" />
-    <ClInclude Include="FilterList.h" />
-    <ClInclude Include="FolderCmp.h" />
-    <ClInclude Include="GhostTextBuffer.h" />
-    <ClInclude Include="GhostTextView.h" />
-    <ClInclude Include="HexMergeDoc.h" />
-    <ClInclude Include="HexMergeFrm.h" />
-    <ClInclude Include="IAbortable.h" />
-    <ClInclude Include="IListCtrlImpl.h" />
-    <ClInclude Include="IntToIntMap.h" />
-    <ClInclude Include="IOptionsPanel.h" />
-    <ClInclude Include="Common\LanguageSelect.h" />
-    <ClInclude Include="JumpList.h" />
-    <ClInclude Include="LineFiltersDlg.h" />
-    <ClInclude Include="LineFiltersList.h" />
-    <ClInclude Include="LoadSaveCodepageDlg.h" />
-    <ClInclude Include="locality.h" />
-    <ClInclude Include="LocationBar.h" />
-    <ClInclude Include="LocationView.h" />
-    <ClInclude Include="Common\lwdisp.h" />
-    <ClInclude Include="MainFrm.h" />
-    <ClInclude Include="markdown.h" />
-    <ClInclude Include="Common\MDITabBar.h" />
-    <ClInclude Include="Common\memdc.h" />
-    <ClInclude Include="Merge.h" />
-    <ClInclude Include="MergeApp.h" />
-    <ClInclude Include="MergeCmdLineInfo.h" />
-    <ClInclude Include="MergeDoc.h" />
-    <ClInclude Include="MergeEditStatus.h" />
-    <ClInclude Include="MergeEditView.h" />
-    <ClInclude Include="MergeLineFlags.h" />
-    <ClInclude Include="Common\MessageBoxDialog.h" />
-    <ClInclude Include="MovedLines.h" />
-    <ClInclude Include="Common\multiformatText.h" />
-    <ClInclude Include="OpenDoc.h" />
-    <ClInclude Include="OpenFrm.h" />
-    <ClInclude Include="OpenView.h" />
-    <ClInclude Include="OptionsDef.h" />
-    <ClInclude Include="common\OptionsMgr.h" />
-    <ClInclude Include="OptionsDiffColors.h" />
-    <ClInclude Include="OptionsDiffOptions.h" />
-    <ClInclude Include="OptionsFont.h" />
-    <ClInclude Include="OptionsInit.h" />
-    <ClInclude Include="OptionsPanel.h" />
-    <ClInclude Include="OptionsSyntaxColors.h" />
-    <ClInclude Include="PatchDlg.h" />
-    <ClInclude Include="PatchHTML.h" />
-    <ClInclude Include="PatchTool.h" />
-    <ClInclude Include="PathContext.h" />
-    <ClInclude Include="paths.h" />
-    <ClInclude Include="Common\Picture.h" />
-    <ClInclude Include="Common\PidlContainer.h" />
-    <ClInclude Include="PluginManager.h" />
-    <ClInclude Include="Plugins.h" />
-    <ClInclude Include="PluginsListDlg.h" />
-    <ClInclude Include="Common\PreferencesDlg.h" />
-    <ClInclude Include="ProjectFile.h" />
-    <ClInclude Include="ProjectFilePathsDlg.h" />
-    <ClInclude Include="PropArchive.h" />
-    <ClInclude Include="PropBackups.h" />
-    <ClInclude Include="PropCodepage.h" />
-    <ClInclude Include="PropColors.h" />
-    <ClInclude Include="PropCompare.h" />
-    <ClInclude Include="PropCompareBinary.h" />
-    <ClInclude Include="PropCompareFolder.h" />
-    <ClInclude Include="PropCompareImage.h" />
-    <ClInclude Include="PropEditor.h" />
-    <ClInclude Include="Common\PropertyPageHost.h" />
-    <ClInclude Include="PropGeneral.h" />
-    <ClInclude Include="PropMarkerColors.h" />
-    <ClInclude Include="PropRegistry.h" />
-    <ClInclude Include="PropShell.h" />
-    <ClInclude Include="PropSyntaxColors.h" />
-    <ClInclude Include="PropTextColors.h" />
-    <ClInclude Include="PropVss.h" />
-    <ClInclude Include="Common\RegKey.h" />
-    <ClInclude Include="Common\RegOptionsMgr.h" />
-    <ClInclude Include="Resource.h" />
-    <ClInclude Include="SaveClosingDlg.h" />
-    <ClInclude Include="Common\scbarcf.h" />
-    <ClInclude Include="Common\scbarg.h" />
-    <ClInclude Include="SelectUnpackerDlg.h" />
-    <ClInclude Include="SharedFilterDlg.h" />
-    <ClInclude Include="Common\ShellContextMenu.h" />
-    <ClInclude Include="Common\ShellFileOperations.h" />
-    <ClInclude Include="Common\sizecbar.h" />
-    <ClInclude Include="Common\SortHeaderCtrl.h" />
-    <ClInclude Include="Common\SplitterWndEx.h" />
-    <ClInclude Include="SourceControl.h" />
-    <ClInclude Include="ssapi.h" />
-    <ClInclude Include="StdAfx.h" />
-    <ClInclude Include="stringdiffs.h" />
-    <ClInclude Include="stringdiffsi.h" />
-    <ClInclude Include="Common\SuperComboBox.h" />
-    <ClInclude Include="TempFile.h" />
-    <ClInclude Include="TestMain.h" />
-    <ClInclude Include="TestFilterDlg.h" />
-    <ClInclude Include="Common\unicoder.h" />
-    <ClInclude Include="Common\UnicodeString.h" />
-    <ClInclude Include="Common\UniFile.h" />
-    <ClInclude Include="TrDialogs.h" />
-    <ClInclude Include="UniMarkdownFile.h" />
-    <ClInclude Include="Common\varprop.h" />
-    <ClInclude Include="Common\version.h" />
-    <ClInclude Include="VSSHelper.h" />
-    <ClInclude Include="VssPromptDlg.h" />
-    <ClInclude Include="WMGotoDlg.h" />
-    <ClInclude Include="diffutils\lib\cmpbuf.h" />
-    <ClInclude Include="diffutils\config.h" />
-    <ClInclude Include="diffutils\src\diff.h" />
-    <ClInclude Include="diffutils\src\system.h" />
-    <ClInclude Include="CompareEngines\ByteComparator.h" />
-    <ClInclude Include="CompareEngines\ByteCompare.h" />
-    <ClInclude Include="CompareEngines\DiffUtils.h" />
-    <ClInclude Include="CompareEngines\TimeSizeCompare.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\Externals\crystaledit\editlib\ccrystaleditview.inl" />
-    <None Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.inl" />
-    <None Include="..\Externals\crystaledit\editlib\ccrystaltextview.inl" />
-    <None Include="..\Externals\crystaledit\editlib\filesup.inl" />
-    <None Include="..\Externals\crystaledit\editlib\memcombo.inl" />
-    <None Include="res\binarydiff.ico" />
-    <None Include="res\both.bmp" />
-    <None Include="res\equalbinary.ico" />
-    <None Include="res\equalfile.ico" />
-    <None Include="res\error.ico" />
-    <None Include="res\fileskip.ico" />
-    <None Include="res\folder.ico" />
-    <None Include="res\folderskip.ico" />
-    <None Include="res\folderup.ico" />
-    <None Include="res\folderup_disable.ico" />
-    <None Include="res\hand.cur" />
-    <None Include="res\left.bmp" />
-    <None Include="res\left_to_browse.bmp" />
-    <None Include="res\left_to_right.bmp" />
-    <None Include="res\lfile.ico" />
-    <None Include="res\lfolder.ico" />
-    <None Include="res\Merge.ico" />
-    <None Include="res\Merge.rc2" />
-    <None Include="res\MergeDir.ico" />
-    <None Include="res\MergeDoc.ico" />
-    <None Include="res\MergeProject.ico" />
-    <None Include="res\mg_cur.cur" />
-    <None Include="res\move_left_to_browse.bmp" />
-    <None Include="res\move_right_to_browse.bmp" />
-    <None Include="res\notequalfile.ico" />
-    <None Include="res\rfile.ico" />
-    <None Include="res\rfolder.ico" />
-    <None Include="res\right.bmp" />
-    <None Include="res\right_to_browse.bmp" />
-    <None Include="res\right_to_left.bmp" />
-    <None Include="res\sigma.ico" />
-    <None Include="CHANGELO" />
-    <None Include="..\Docs\Users\ChangeLog.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="Merge.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-  <ProjectExtensions>
-    <VisualStudio>
-      <UserProperties RESOURCE_FILE="Merge.rc" />
-    </VisualStudio>
-  </ProjectExtensions>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Test|Win32">\r
+      <Configuration>Test</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Test|x64">\r
+      <Configuration>Test</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="UnicodeDebug|Win32">\r
+      <Configuration>UnicodeDebug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="UnicodeDebug|x64">\r
+      <Configuration>UnicodeDebug</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="UnicodeRelease|Win32">\r
+      <Configuration>UnicodeRelease</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="UnicodeRelease|x64">\r
+      <Configuration>UnicodeRelease</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectName>Merge</ProjectName>\r
+    <ProjectGuid>{9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}</ProjectGuid>\r
+    <RootNamespace>Merge</RootNamespace>\r
+    <Keyword>MFCProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseOfMfc>Static</UseOfMfc>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+    <PlatformToolset>v141_xp</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|Win32'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseOfMfc>Static</UseOfMfc>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+    <PlatformToolset>v141_xp</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseOfMfc>Static</UseOfMfc>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+    <PlatformToolset>v141_xp</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseOfMfc>Static</UseOfMfc>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+    <PlatformToolset>v141_xp</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|x64'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseOfMfc>Static</UseOfMfc>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+    <PlatformToolset>v141_xp</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseOfMfc>Static</UseOfMfc>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+    <PlatformToolset>v141_xp</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Test|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Test|x64'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup>\r
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">.\..\Build\Merge$(Configuration)\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">.\..\BuildTmp\Merge$(Configuration)\</IntDir>\r
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">false</LinkIncremental>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">.\..\Build\$(Platform)\Merge$(Configuration)\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">.\..\BuildTmp\$(Platform)\Merge$(Configuration)\</IntDir>\r
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">false</LinkIncremental>\r
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">true</EmbedManifest>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">.\..\Build\Merge$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">.\..\Build\Merge$(Configuration)\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">.\..\BuildTmp\Merge$(Configuration)\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">.\..\BuildTmp\Merge$(Configuration)\</IntDir>\r
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</LinkIncremental>\r
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">true</LinkIncremental>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">.\..\Build\$(Platform)\Merge$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Test|x64'">.\..\Build\$(Platform)\Merge$(Configuration)\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">.\..\BuildTmp\$(Platform)\Merge$(Configuration)\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Test|x64'">.\..\BuildTmp\$(Platform)\Merge$(Configuration)\</IntDir>\r
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">true</LinkIncremental>\r
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Test|x64'">true</LinkIncremental>\r
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">true</EmbedManifest>\r
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Test|x64'">true</EmbedManifest>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">Win$(ProjectName)U</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Test|x64'">Win$(ProjectName)U</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">Win$(ProjectName)U</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Win$(ProjectName)U</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">Win$(ProjectName)U</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">Win$(ProjectName)U</TargetName>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">\r
+    <Midl>\r
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <MkTypLibCompatible>true</MkTypLibCompatible>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <TargetEnvironment>Win32</TargetEnvironment>\r
+      <HeaderFileName>\r
+      </HeaderFileName>\r
+    </Midl>\r
+    <ClCompile>\r
+      <AdditionalOptions>/EHa  %(AdditionalOptions)</AdditionalOptions>\r
+      <Optimization>MinSpace</Optimization>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>WINVER=0x0501;WIN32;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <StringPooling>true</StringPooling>\r
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <CompileAs>Default</CompileAs>\r
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+      <ExceptionHandling>Async</ExceptionHandling>\r
+    </ClCompile>\r
+    <ResourceCompile>\r
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <Culture>0x0409</Culture>\r
+    </ResourceCompile>\r
+    <Link>\r
+      <AdditionalOptions>/verbose:lib %(AdditionalOptions)</AdditionalOptions>\r
+      <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <OutputFile>$(OutDir)/WinMergeU.exe</OutputFile>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <AdditionalLibraryDirectories>..\Externals\poco\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <IgnoreSpecificDefaultLibraries>msvcrtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Windows</SubSystem>\r
+      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>\r
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
+      <DataExecutionPrevention>\r
+      </DataExecutionPrevention>\r
+      <TargetMachine>MachineX86</TargetMachine>\r
+      <GenerateMapFile>true</GenerateMapFile>\r
+    </Link>\r
+    <PostBuildEvent>\r
+      <Command>\r
+      </Command>\r
+    </PostBuildEvent>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">\r
+    <CustomBuildStep>\r
+      <Command>\r
+      </Command>\r
+      <Outputs>$(TargetDir)WinMergeU.map;%(Outputs)</Outputs>\r
+    </CustomBuildStep>\r
+    <Midl>\r
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <MkTypLibCompatible>true</MkTypLibCompatible>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <TargetEnvironment>X64</TargetEnvironment>\r
+      <HeaderFileName>\r
+      </HeaderFileName>\r
+    </Midl>\r
+    <ClCompile>\r
+      <AdditionalOptions>/EHa  %(AdditionalOptions)</AdditionalOptions>\r
+      <Optimization>MinSpace</Optimization>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>WINVER=0x0501;WIN64;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <StringPooling>true</StringPooling>\r
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <CompileAs>Default</CompileAs>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+      <ExceptionHandling>Async</ExceptionHandling>\r
+    </ClCompile>\r
+    <ResourceCompile>\r
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <Culture>0x0409</Culture>\r
+    </ResourceCompile>\r
+    <Link>\r
+      <AdditionalOptions>/verbose:lib %(AdditionalOptions)</AdditionalOptions>\r
+      <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <OutputFile>$(OutDir)/WinMergeU.exe</OutputFile>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <AdditionalLibraryDirectories>..\Externals\poco\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <IgnoreSpecificDefaultLibraries>msvcrtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Windows</SubSystem>\r
+      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>\r
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
+      <DataExecutionPrevention>\r
+      </DataExecutionPrevention>\r
+      <TargetMachine>MachineX64</TargetMachine>\r
+      <GenerateMapFile>true</GenerateMapFile>\r
+      <OptimizeReferences>\r
+      </OptimizeReferences>\r
+    </Link>\r
+    <PostBuildEvent>\r
+      <Command>\r
+      </Command>\r
+    </PostBuildEvent>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">\r
+    <Midl>\r
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <MkTypLibCompatible>true</MkTypLibCompatible>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <TargetEnvironment>Win32</TargetEnvironment>\r
+      <HeaderFileName>\r
+      </HeaderFileName>\r
+    </Midl>\r
+    <ClCompile>\r
+      <AdditionalOptions>/EHa  %(AdditionalOptions)</AdditionalOptions>\r
+      <Optimization>Disabled</Optimization>\r
+      <AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>WINVER=0x0501;_DEBUG;WIN32;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\r
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
+      <CompileAs>Default</CompileAs>\r
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+      <ExceptionHandling>Async</ExceptionHandling>\r
+    </ClCompile>\r
+    <ResourceCompile>\r
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <Culture>0x0409</Culture>\r
+    </ResourceCompile>\r
+    <Link>\r
+      <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <OutputFile>$(OutDir)/WinMergeU.exe</OutputFile>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <AdditionalLibraryDirectories>..\Externals\poco\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Windows</SubSystem>\r
+      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>\r
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
+      <DataExecutionPrevention>\r
+      </DataExecutionPrevention>\r
+      <TargetMachine>MachineX86</TargetMachine>\r
+      <GenerateMapFile>true</GenerateMapFile>\r
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>\r
+    </Link>\r
+    <PostBuildEvent>\r
+      <Command>\r
+      </Command>\r
+    </PostBuildEvent>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">\r
+    <Midl>\r
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <MkTypLibCompatible>true</MkTypLibCompatible>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <TargetEnvironment>Win32</TargetEnvironment>\r
+      <HeaderFileName>\r
+      </HeaderFileName>\r
+    </Midl>\r
+    <ClCompile>\r
+      <AdditionalOptions>/EHa  %(AdditionalOptions)</AdditionalOptions>\r
+      <Optimization>Disabled</Optimization>\r
+      <AdditionalIncludeDirectories>.;..\Externals\gtest;..\Externals\gtest\include;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>TEST_WINMERGE;WINVER=0x0501;_DEBUG;WIN32;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\r
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
+      <CompileAs>Default</CompileAs>\r
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+      <ExceptionHandling>Async</ExceptionHandling>\r
+    </ClCompile>\r
+    <ResourceCompile>\r
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <Culture>0x0409</Culture>\r
+    </ResourceCompile>\r
+    <Link>\r
+      <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <OutputFile>$(OutDir)/WinMergeU.exe</OutputFile>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <AdditionalLibraryDirectories>..\Externals\poco\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Console</SubSystem>\r
+      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>\r
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
+      <DataExecutionPrevention>\r
+      </DataExecutionPrevention>\r
+      <TargetMachine>MachineX86</TargetMachine>\r
+      <GenerateMapFile>true</GenerateMapFile>\r
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>\r
+    </Link>\r
+    <PostBuildEvent>\r
+      <Command>\r
+      </Command>\r
+    </PostBuildEvent>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">\r
+    <CustomBuildStep>\r
+      <Command>\r
+      </Command>\r
+      <Outputs>$(TargetDir)WinMergeU.map;%(Outputs)</Outputs>\r
+    </CustomBuildStep>\r
+    <Midl>\r
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <MkTypLibCompatible>true</MkTypLibCompatible>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <TargetEnvironment>X64</TargetEnvironment>\r
+      <HeaderFileName>\r
+      </HeaderFileName>\r
+    </Midl>\r
+    <ClCompile>\r
+      <AdditionalOptions>/EHa  %(AdditionalOptions)</AdditionalOptions>\r
+      <Optimization>Disabled</Optimization>\r
+      <AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>WINVER=0x0501;_DEBUG;WIN64;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\r
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
+      <CompileAs>Default</CompileAs>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+      <ExceptionHandling>Async</ExceptionHandling>\r
+    </ClCompile>\r
+    <ResourceCompile>\r
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <Culture>0x0409</Culture>\r
+    </ResourceCompile>\r
+    <Link>\r
+      <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <OutputFile>$(OutDir)/WinMergeU.exe</OutputFile>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <AdditionalLibraryDirectories>..\Externals\poco\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Windows</SubSystem>\r
+      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>\r
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
+      <DataExecutionPrevention>\r
+      </DataExecutionPrevention>\r
+      <TargetMachine>MachineX64</TargetMachine>\r
+      <GenerateMapFile>true</GenerateMapFile>\r
+      <Profile>false</Profile>\r
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>\r
+    </Link>\r
+    <PostBuildEvent>\r
+      <Command>\r
+      </Command>\r
+    </PostBuildEvent>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Test|x64'">\r
+    <CustomBuildStep>\r
+      <Command>\r
+      </Command>\r
+      <Outputs>$(TargetDir)WinMergeU.map;%(Outputs)</Outputs>\r
+    </CustomBuildStep>\r
+    <Midl>\r
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <MkTypLibCompatible>true</MkTypLibCompatible>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <TargetEnvironment>X64</TargetEnvironment>\r
+      <HeaderFileName>\r
+      </HeaderFileName>\r
+    </Midl>\r
+    <ClCompile>\r
+      <AdditionalOptions>/EHa  %(AdditionalOptions)</AdditionalOptions>\r
+      <Optimization>Disabled</Optimization>\r
+      <AdditionalIncludeDirectories>.;..\Externals\gtest;..\Externals\gtest\include;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>TEST_WINMERGE;WINVER=0x0501;_DEBUG;WIN64;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\r
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
+      <CompileAs>Default</CompileAs>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+      <ExceptionHandling>Async</ExceptionHandling>\r
+    </ClCompile>\r
+    <ResourceCompile>\r
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <Culture>0x0409</Culture>\r
+    </ResourceCompile>\r
+    <Link>\r
+      <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <OutputFile>$(OutDir)/WinMergeU.exe</OutputFile>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <AdditionalLibraryDirectories>..\Externals\poco\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Console</SubSystem>\r
+      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>\r
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
+      <DataExecutionPrevention>\r
+      </DataExecutionPrevention>\r
+      <TargetMachine>MachineX64</TargetMachine>\r
+      <GenerateMapFile>true</GenerateMapFile>\r
+      <Profile>false</Profile>\r
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>\r
+    </Link>\r
+    <PostBuildEvent>\r
+      <Command>\r
+      </Command>\r
+    </PostBuildEvent>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\asp.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\basic.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\batch.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaleditview.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview2.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ceditreplacedlg.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\cfindtextdlg.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\chcondlg.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\cplusplus.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\cregexp_poco.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\crystaleditviewex.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\crystalparser.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\crystaltextblock.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\cs2cs.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\csharp.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\css.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ctextmarkerdlg.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\dcl.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\filesup.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\fortran.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\fpattern.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\go.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\gotodlg.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\html.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ini.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\innosetup.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\is.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\java.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\LineInfo.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\lisp.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\memcombo.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\nsis.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\pascal.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\perl.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\php.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\po.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\powershell.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\python.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\registry.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\rexx.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\rsrc.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ruby.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\rust.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\sgml.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\sh.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\siod.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\sql.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\statbar.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\string_util.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\SyntaxColors.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\tcl.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\tex.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\UndoRecord.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\verilog.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ViewableWhitespace.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\xml.cpp" />\r
+    <ClCompile Include="7zCommon.cpp">\r
+    </ClCompile>\r
+    <ClCompile Include="AboutDlg.cpp">\r
+    </ClCompile>\r
+    <ClCompile Include="Common\BCMenu.cpp" />\r
+    <ClCompile Include="Common\Bitmap.cpp" />\r
+    <ClCompile Include="CCPromptDlg.cpp">\r
+    </ClCompile>\r
+    <ClCompile Include="charsets.c">\r
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Test|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Test|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</BrowseInformation>\r
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">true</BrowseInformation>\r
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">true</BrowseInformation>\r
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Test|x64'">true</BrowseInformation>\r
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Disabled</Optimization>\r
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">Disabled</Optimization>\r
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">Disabled</Optimization>\r
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Test|x64'">Disabled</Optimization>\r
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">MinSpace</Optimization>\r
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">MinSpace</Optimization>\r
+    </ClCompile>\r
+    <ClCompile Include="ChildFrm.cpp" />\r
+    <ClCompile Include="Common\ClipBoard.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\CMoveConstraint.cpp" />\r
+    <ClCompile Include="codepage_detect.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\ColorButton.cpp" />\r
+    <ClCompile Include="Common\ExConverter.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareEngines\BinaryCompare.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareOptions.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareStatisticsDlg.cpp" />\r
+    <ClCompile Include="CompareStats.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="ConfigLog.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="ConfirmFolderCopyDlg.cpp" />\r
+    <ClCompile Include="ConflictFileParser.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\coretools.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="DropHandler.cpp" />\r
+    <ClCompile Include="ImgMergeFrm.cpp" />\r
+    <ClCompile Include="Merge7zFormatMergePluginImpl.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="Merge7zFormatShellImpl.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="MergeStatusBar.cpp" />\r
+    <ClCompile Include="OptionsDef.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="OptionsCustomColors.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffContext.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffFileData.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffFileInfo.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffItem.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffItemList.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffList.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffTextBuffer.cpp" />\r
+    <ClCompile Include="DiffThread.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffViewBar.cpp" />\r
+    <ClCompile Include="DiffWrapper.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="DirActions.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="DirCmpReport.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="DirCmpReportDlg.cpp" />\r
+    <ClCompile Include="DirColsDlg.cpp" />\r
+    <ClCompile Include="DirCompProgressBar.cpp" />\r
+    <ClCompile Include="DirDoc.cpp" />\r
+    <ClCompile Include="DirFrame.cpp" />\r
+    <ClCompile Include="DirItem.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="DirScan.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="DirTravel.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="DirView.cpp" />\r
+    <ClCompile Include="DirViewColItems.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="dllpstub.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="EditorFilepathBar.cpp" />\r
+    <ClCompile Include="EncodingErrorBar.cpp" />\r
+    <ClCompile Include="Environment.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="FileActionScript.cpp" />\r
+    <ClCompile Include="FileFilter.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="FileFilterHelper.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="FileFilterMgr.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="FileFiltersDlg.cpp" />\r
+    <ClCompile Include="FileOrFolderSelect.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="FilepathEdit.cpp" />\r
+    <ClCompile Include="FileTextEncoding.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="FileTransform.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="FileVersion.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="FilterCommentsManager.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="FilterList.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="FolderCmp.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="GhostTextBuffer.cpp" />\r
+    <ClCompile Include="GhostTextView.cpp" />\r
+    <ClCompile Include="HexMergeDoc.cpp" />\r
+    <ClCompile Include="HexMergeFrm.cpp" />\r
+    <ClCompile Include="HexMergeView.cpp" />\r
+    <ClCompile Include="Common\LanguageSelect.cpp" />\r
+    <ClCompile Include="JumpList.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="LineFiltersDlg.cpp" />\r
+    <ClCompile Include="LineFiltersList.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="LoadSaveCodepageDlg.cpp" />\r
+    <ClCompile Include="locality.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="LocationBar.cpp" />\r
+    <ClCompile Include="LocationView.cpp" />\r
+    <ClCompile Include="Common\lwdisp.c">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="MainFrm.cpp" />\r
+    <ClCompile Include="markdown.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\MDITabBar.cpp" />\r
+    <ClCompile Include="Merge.cpp" />\r
+    <ClCompile Include="MergeApp.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="MergeCmdLineInfo.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="MergeDoc.cpp" />\r
+    <ClCompile Include="MergeDocDiffSync.cpp" />\r
+    <ClCompile Include="MergeDocEncoding.cpp" />\r
+    <ClCompile Include="MergeDocLineDiffs.cpp" />\r
+    <ClCompile Include="MergeEditView.cpp" />\r
+    <ClCompile Include="Common\MessageBoxDialog.cpp" />\r
+    <ClCompile Include="MovedBlocks.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="MovedLines.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\multiformatText.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="OpenDoc.cpp" />\r
+    <ClCompile Include="OpenFrm.cpp" />\r
+    <ClCompile Include="OpenView.cpp" />\r
+    <ClCompile Include="OptionsDiffColors.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="OptionsDiffOptions.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="OptionsFont.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="OptionsInit.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="common\OptionsMgr.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="OptionsPanel.cpp" />\r
+    <ClCompile Include="OptionsSyntaxColors.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="PatchDlg.cpp" />\r
+    <ClCompile Include="PatchHTML.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="PatchTool.cpp" />\r
+    <ClCompile Include="PathContext.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="paths.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\Picture.cpp" />\r
+    <ClCompile Include="Common\PidlContainer.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="PluginManager.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="Plugins.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="PluginsListDlg.cpp" />\r
+    <ClCompile Include="Common\PreferencesDlg.cpp" />\r
+    <ClCompile Include="ProjectFile.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="ProjectFilePathsDlg.cpp" />\r
+    <ClCompile Include="PropArchive.cpp" />\r
+    <ClCompile Include="PropBackups.cpp" />\r
+    <ClCompile Include="PropCodepage.cpp" />\r
+    <ClCompile Include="PropColors.cpp" />\r
+    <ClCompile Include="PropCompare.cpp" />\r
+    <ClCompile Include="PropCompareBinary.cpp" />\r
+    <ClCompile Include="PropCompareFolder.cpp" />\r
+    <ClCompile Include="PropCompareImage.cpp" />\r
+    <ClCompile Include="PropEditor.cpp" />\r
+    <ClCompile Include="Common\PropertyPageHost.cpp" />\r
+    <ClCompile Include="PropGeneral.cpp" />\r
+    <ClCompile Include="PropMarkerColors.cpp" />\r
+    <ClCompile Include="PropRegistry.cpp" />\r
+    <ClCompile Include="PropShell.cpp" />\r
+    <ClCompile Include="PropSyntaxColors.cpp" />\r
+    <ClCompile Include="PropTextColors.cpp" />\r
+    <ClCompile Include="PropVss.cpp" />\r
+    <ClCompile Include="Common\RegKey.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\RegOptionsMgr.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="SaveClosingDlg.cpp" />\r
+    <ClCompile Include="Common\scbarcf.cpp" />\r
+    <ClCompile Include="Common\scbarg.cpp" />\r
+    <ClCompile Include="SelectUnpackerDlg.cpp" />\r
+    <ClCompile Include="SharedFilterDlg.cpp" />\r
+    <ClCompile Include="Common\ShellContextMenu.cpp" />\r
+    <ClCompile Include="Common\ShellFileOperations.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\sizecbar.cpp" />\r
+    <ClCompile Include="Common\SortHeaderCtrl.cpp" />\r
+    <ClCompile Include="SourceControl.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\SplitterWndEx.cpp" />\r
+    <ClCompile Include="StdAfx.cpp">\r
+      <PrecompiledHeader>Create</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="stringdiffs.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\SuperComboBox.cpp" />\r
+    <ClCompile Include="TempFile.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="Test.cpp" />\r
+    <ClCompile Include="TestFilterDlg.cpp" />\r
+    <ClCompile Include="Common\unicoder.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\UnicodeString.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\UniFile.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="TestMain.cpp" />\r
+    <ClCompile Include="TrDialogs.cpp" />\r
+    <ClCompile Include="UniMarkdownFile.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\varprop.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\version.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="VSSHelper.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="VssPromptDlg.cpp" />\r
+    <ClCompile Include="WMGotoDlg.cpp" />\r
+    <ClCompile Include="diffutils\src\analyze.c">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="diffutils\lib\cmpbuf.c">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="diffutils\src\context.c">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="diffutils\src\Diff.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="diffutils\src\ed.c">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="diffutils\GnuVersion.c">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="diffutils\src\ifdef.c">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="diffutils\src\io.c">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="diffutils\src\normal.c">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="diffutils\src\side.c">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="diffutils\src\util.c">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="diffutils\src\mystat.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareEngines\ByteComparator.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareEngines\ByteCompare.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareEngines\DiffUtils.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareEngines\TimeSizeCompare.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaleditview.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextview.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\ceditreplacedlg.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\cfindtextdlg.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\chcondlg.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\cregexp.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\crystaleditviewex.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\crystalparser.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\crystaltextblock.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\cs2cs.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\ctextmarkerdlg.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\editcmd.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\editreg.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\edtlib.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\filesup.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\fpattern.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\gotodlg.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\LineInfo.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\memcombo.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\registry.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\statbar.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\string_util.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\SyntaxColors.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\UndoRecord.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\ViewableWhitespace.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\wispelld.h" />\r
+    <ClInclude Include="7zCommon.h" />\r
+    <ClInclude Include="AboutDlg.h" />\r
+    <ClInclude Include="Common\BCMenu.h" />\r
+    <ClInclude Include="Common\Bitmap.h" />\r
+    <ClInclude Include="CCPromptDlg.h" />\r
+    <ClInclude Include="charsets.h" />\r
+    <ClInclude Include="ChildFrm.h" />\r
+    <ClInclude Include="Common\ClipBoard.h" />\r
+    <ClInclude Include="Common\CMoveConstraint.h" />\r
+    <ClInclude Include="codepage_detect.h" />\r
+    <ClInclude Include="Common\ColorButton.h" />\r
+    <ClInclude Include="Common\ExConverter.h" />\r
+    <ClInclude Include="CompareEngines\BinaryCompare.h" />\r
+    <ClInclude Include="CompareOptions.h" />\r
+    <ClInclude Include="CompareStatisticsDlg.h" />\r
+    <ClInclude Include="CompareStats.h" />\r
+    <ClInclude Include="ConfigLog.h" />\r
+    <ClInclude Include="ConfirmFolderCopyDlg.h" />\r
+    <ClInclude Include="ConflictFileParser.h" />\r
+    <ClInclude Include="Common\coretools.h" />\r
+    <ClInclude Include="Common\coretypes.h" />\r
+    <ClInclude Include="Constants.h" />\r
+    <ClInclude Include="DirActions.h" />\r
+    <ClInclude Include="HexMergeView.h" />\r
+    <ClInclude Include="DropHandler.h" />\r
+    <ClInclude Include="IMergeDoc.h" />\r
+    <ClInclude Include="ImgMergeFrm.h" />\r
+    <ClInclude Include="Merge7zFormatMergePluginImpl.h" />\r
+    <ClInclude Include="Merge7zFormatRegister.h" />\r
+    <ClInclude Include="Merge7zFormatShellImpl.h" />\r
+    <ClInclude Include="MergeStatusBar.h" />\r
+    <ClInclude Include="OptionsCustomColors.h" />\r
+    <ClInclude Include="Diff3.h" />\r
+    <ClInclude Include="DiffContext.h" />\r
+    <ClInclude Include="DiffFileData.h" />\r
+    <ClInclude Include="DiffFileInfo.h" />\r
+    <ClInclude Include="DiffItem.h" />\r
+    <ClInclude Include="DiffItemList.h" />\r
+    <ClInclude Include="DiffList.h" />\r
+    <ClInclude Include="DiffTextBuffer.h" />\r
+    <ClInclude Include="DiffThread.h" />\r
+    <ClInclude Include="DiffViewBar.h" />\r
+    <ClInclude Include="DiffWrapper.h" />\r
+    <ClInclude Include="DirCmpReport.h" />\r
+    <ClInclude Include="DirCmpReportDlg.h" />\r
+    <ClInclude Include="DirColsDlg.h" />\r
+    <ClInclude Include="DirCompProgressBar.h" />\r
+    <ClInclude Include="DirDoc.h" />\r
+    <ClInclude Include="DirFrame.h" />\r
+    <ClInclude Include="DirItem.h" />\r
+    <ClInclude Include="DirReportTypes.h" />\r
+    <ClInclude Include="DirScan.h" />\r
+    <ClInclude Include="DirTravel.h" />\r
+    <ClInclude Include="DirView.h" />\r
+    <ClInclude Include="DirViewColItems.h" />\r
+    <ClInclude Include="dllpstub.h" />\r
+    <ClInclude Include="EditorFilepathBar.h" />\r
+    <ClInclude Include="EncodingErrorBar.h" />\r
+    <ClInclude Include="Environment.h" />\r
+    <ClInclude Include="Exceptions.h" />\r
+    <ClInclude Include="FileActionScript.h" />\r
+    <ClInclude Include="FileFilter.h" />\r
+    <ClInclude Include="FileFilterHelper.h" />\r
+    <ClInclude Include="FileFilterMgr.h" />\r
+    <ClInclude Include="FileFiltersDlg.h" />\r
+    <ClInclude Include="FileLocation.h" />\r
+    <ClInclude Include="FileOrFolderSelect.h" />\r
+    <ClInclude Include="FilepathEdit.h" />\r
+    <ClInclude Include="files.h" />\r
+    <ClInclude Include="FileTextEncoding.h" />\r
+    <ClInclude Include="FileTextStats.h" />\r
+    <ClInclude Include="FileTransform.h" />\r
+    <ClInclude Include="FileVersion.h" />\r
+    <ClInclude Include="FilterCommentsManager.h" />\r
+    <ClInclude Include="FilterList.h" />\r
+    <ClInclude Include="FolderCmp.h" />\r
+    <ClInclude Include="GhostTextBuffer.h" />\r
+    <ClInclude Include="GhostTextView.h" />\r
+    <ClInclude Include="HexMergeDoc.h" />\r
+    <ClInclude Include="HexMergeFrm.h" />\r
+    <ClInclude Include="IAbortable.h" />\r
+    <ClInclude Include="IListCtrlImpl.h" />\r
+    <ClInclude Include="IntToIntMap.h" />\r
+    <ClInclude Include="IOptionsPanel.h" />\r
+    <ClInclude Include="Common\LanguageSelect.h" />\r
+    <ClInclude Include="JumpList.h" />\r
+    <ClInclude Include="LineFiltersDlg.h" />\r
+    <ClInclude Include="LineFiltersList.h" />\r
+    <ClInclude Include="LoadSaveCodepageDlg.h" />\r
+    <ClInclude Include="locality.h" />\r
+    <ClInclude Include="LocationBar.h" />\r
+    <ClInclude Include="LocationView.h" />\r
+    <ClInclude Include="Common\lwdisp.h" />\r
+    <ClInclude Include="MainFrm.h" />\r
+    <ClInclude Include="markdown.h" />\r
+    <ClInclude Include="Common\MDITabBar.h" />\r
+    <ClInclude Include="Common\memdc.h" />\r
+    <ClInclude Include="Merge.h" />\r
+    <ClInclude Include="MergeApp.h" />\r
+    <ClInclude Include="MergeCmdLineInfo.h" />\r
+    <ClInclude Include="MergeDoc.h" />\r
+    <ClInclude Include="MergeEditStatus.h" />\r
+    <ClInclude Include="MergeEditView.h" />\r
+    <ClInclude Include="MergeLineFlags.h" />\r
+    <ClInclude Include="Common\MessageBoxDialog.h" />\r
+    <ClInclude Include="MovedLines.h" />\r
+    <ClInclude Include="Common\multiformatText.h" />\r
+    <ClInclude Include="OpenDoc.h" />\r
+    <ClInclude Include="OpenFrm.h" />\r
+    <ClInclude Include="OpenView.h" />\r
+    <ClInclude Include="OptionsDef.h" />\r
+    <ClInclude Include="common\OptionsMgr.h" />\r
+    <ClInclude Include="OptionsDiffColors.h" />\r
+    <ClInclude Include="OptionsDiffOptions.h" />\r
+    <ClInclude Include="OptionsFont.h" />\r
+    <ClInclude Include="OptionsInit.h" />\r
+    <ClInclude Include="OptionsPanel.h" />\r
+    <ClInclude Include="OptionsSyntaxColors.h" />\r
+    <ClInclude Include="PatchDlg.h" />\r
+    <ClInclude Include="PatchHTML.h" />\r
+    <ClInclude Include="PatchTool.h" />\r
+    <ClInclude Include="PathContext.h" />\r
+    <ClInclude Include="paths.h" />\r
+    <ClInclude Include="Common\Picture.h" />\r
+    <ClInclude Include="Common\PidlContainer.h" />\r
+    <ClInclude Include="PluginManager.h" />\r
+    <ClInclude Include="Plugins.h" />\r
+    <ClInclude Include="PluginsListDlg.h" />\r
+    <ClInclude Include="Common\PreferencesDlg.h" />\r
+    <ClInclude Include="ProjectFile.h" />\r
+    <ClInclude Include="ProjectFilePathsDlg.h" />\r
+    <ClInclude Include="PropArchive.h" />\r
+    <ClInclude Include="PropBackups.h" />\r
+    <ClInclude Include="PropCodepage.h" />\r
+    <ClInclude Include="PropColors.h" />\r
+    <ClInclude Include="PropCompare.h" />\r
+    <ClInclude Include="PropCompareBinary.h" />\r
+    <ClInclude Include="PropCompareFolder.h" />\r
+    <ClInclude Include="PropCompareImage.h" />\r
+    <ClInclude Include="PropEditor.h" />\r
+    <ClInclude Include="Common\PropertyPageHost.h" />\r
+    <ClInclude Include="PropGeneral.h" />\r
+    <ClInclude Include="PropMarkerColors.h" />\r
+    <ClInclude Include="PropRegistry.h" />\r
+    <ClInclude Include="PropShell.h" />\r
+    <ClInclude Include="PropSyntaxColors.h" />\r
+    <ClInclude Include="PropTextColors.h" />\r
+    <ClInclude Include="PropVss.h" />\r
+    <ClInclude Include="Common\RegKey.h" />\r
+    <ClInclude Include="Common\RegOptionsMgr.h" />\r
+    <ClInclude Include="Resource.h" />\r
+    <ClInclude Include="SaveClosingDlg.h" />\r
+    <ClInclude Include="Common\scbarcf.h" />\r
+    <ClInclude Include="Common\scbarg.h" />\r
+    <ClInclude Include="SelectUnpackerDlg.h" />\r
+    <ClInclude Include="SharedFilterDlg.h" />\r
+    <ClInclude Include="Common\ShellContextMenu.h" />\r
+    <ClInclude Include="Common\ShellFileOperations.h" />\r
+    <ClInclude Include="Common\sizecbar.h" />\r
+    <ClInclude Include="Common\SortHeaderCtrl.h" />\r
+    <ClInclude Include="Common\SplitterWndEx.h" />\r
+    <ClInclude Include="SourceControl.h" />\r
+    <ClInclude Include="ssapi.h" />\r
+    <ClInclude Include="StdAfx.h" />\r
+    <ClInclude Include="stringdiffs.h" />\r
+    <ClInclude Include="stringdiffsi.h" />\r
+    <ClInclude Include="Common\SuperComboBox.h" />\r
+    <ClInclude Include="TempFile.h" />\r
+    <ClInclude Include="TestMain.h" />\r
+    <ClInclude Include="TestFilterDlg.h" />\r
+    <ClInclude Include="Common\unicoder.h" />\r
+    <ClInclude Include="Common\UnicodeString.h" />\r
+    <ClInclude Include="Common\UniFile.h" />\r
+    <ClInclude Include="TrDialogs.h" />\r
+    <ClInclude Include="UniMarkdownFile.h" />\r
+    <ClInclude Include="Common\varprop.h" />\r
+    <ClInclude Include="Common\version.h" />\r
+    <ClInclude Include="VSSHelper.h" />\r
+    <ClInclude Include="VssPromptDlg.h" />\r
+    <ClInclude Include="WMGotoDlg.h" />\r
+    <ClInclude Include="diffutils\lib\cmpbuf.h" />\r
+    <ClInclude Include="diffutils\config.h" />\r
+    <ClInclude Include="diffutils\src\diff.h" />\r
+    <ClInclude Include="diffutils\src\system.h" />\r
+    <ClInclude Include="CompareEngines\ByteComparator.h" />\r
+    <ClInclude Include="CompareEngines\ByteCompare.h" />\r
+    <ClInclude Include="CompareEngines\DiffUtils.h" />\r
+    <ClInclude Include="CompareEngines\TimeSizeCompare.h" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="..\Externals\crystaledit\editlib\ccrystaleditview.inl" />\r
+    <None Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.inl" />\r
+    <None Include="..\Externals\crystaledit\editlib\ccrystaltextview.inl" />\r
+    <None Include="..\Externals\crystaledit\editlib\filesup.inl" />\r
+    <None Include="..\Externals\crystaledit\editlib\memcombo.inl" />\r
+    <None Include="res\binarydiff.ico" />\r
+    <None Include="res\both.bmp" />\r
+    <None Include="res\equalbinary.ico" />\r
+    <None Include="res\equalfile.ico" />\r
+    <None Include="res\error.ico" />\r
+    <None Include="res\fileskip.ico" />\r
+    <None Include="res\folder.ico" />\r
+    <None Include="res\folderskip.ico" />\r
+    <None Include="res\folderup.ico" />\r
+    <None Include="res\folderup_disable.ico" />\r
+    <None Include="res\hand.cur" />\r
+    <None Include="res\left.bmp" />\r
+    <None Include="res\left_to_browse.bmp" />\r
+    <None Include="res\left_to_right.bmp" />\r
+    <None Include="res\lfile.ico" />\r
+    <None Include="res\lfolder.ico" />\r
+    <None Include="res\Merge.ico" />\r
+    <None Include="res\Merge.rc2" />\r
+    <None Include="res\MergeDir.ico" />\r
+    <None Include="res\MergeDoc.ico" />\r
+    <None Include="res\MergeProject.ico" />\r
+    <None Include="res\mg_cur.cur" />\r
+    <None Include="res\move_left_to_browse.bmp" />\r
+    <None Include="res\move_right_to_browse.bmp" />\r
+    <None Include="res\notequalfile.ico" />\r
+    <None Include="res\rfile.ico" />\r
+    <None Include="res\rfolder.ico" />\r
+    <None Include="res\right.bmp" />\r
+    <None Include="res\right_to_browse.bmp" />\r
+    <None Include="res\right_to_left.bmp" />\r
+    <None Include="res\sigma.ico" />\r
+    <None Include="CHANGELO" />\r
+    <None Include="..\Docs\Users\ChangeLog.txt" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ResourceCompile Include="Merge.rc" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+  <ProjectExtensions>\r
+    <VisualStudio>\r
+      <UserProperties RESOURCE_FILE="Merge.rc" />\r
+    </VisualStudio>\r
+  </ProjectExtensions>\r
 </Project>
\ No newline at end of file
diff --git a/Src/Merge.vs2017.vcxproj.filters b/Src/Merge.vs2017.vcxproj.filters
index 0ca1659..a401f53 100644 (file)
--- a/Src/Merge.vs2017.vcxproj.filters
+++ b/Src/Merge.vs2017.vcxproj.filters
@@ -1,1544 +1,1544 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{e8f63c02-8bf9-425d-88d0-831ca188bbdf}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{ff78af1d-3eee-4c01-8be1-27cf73dfe922}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{4e04f59d-bb70-4e67-a8d7-2b01fb6d0cd8}</UniqueIdentifier>
-      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>
-    </Filter>
-    <Filter Include="EditLib">
-      <UniqueIdentifier>{84d4664c-e7ea-4d24-8d55-b1303c40b7f4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="DiffEngine">
-      <UniqueIdentifier>{16e1af2b-75c9-4deb-b49f-819018df0478}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="ChangeLogs">
-      <UniqueIdentifier>{aefb7247-d6e5-411d-9cc5-4a12f5efda4a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Compare Engines">
-      <UniqueIdentifier>{b889169f-de55-4db7-ad06-423f6438fa90}</UniqueIdentifier>
-      <Extensions>cpp;c;h</Extensions>
-    </Filter>
-    <Filter Include="EditLib\parsers">
-      <UniqueIdentifier>{740d4dd9-ab31-47b8-9cbb-8e6a7b5db4fe}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="MFCGui">
-      <UniqueIdentifier>{caf52667-921a-47aa-84a3-f277aac15107}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="MFCGui\Source Files">
-      <UniqueIdentifier>{5dc3ba0d-6755-48f8-ad11-df56b167b514}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="MFCGui\Header Files">
-      <UniqueIdentifier>{10ce7aff-bcfd-4ed0-98c3-766226c4c89e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="MFCGui\Dialogs">
-      <UniqueIdentifier>{d520b3a7-c530-4053-8766-07c26ed85f85}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="MFCGui\Dialogs\PropertyPages">
-      <UniqueIdentifier>{c6b39fdf-7c68-42c3-895b-da25bb6e51b4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="MFCGui\Common">
-      <UniqueIdentifier>{297182f0-e39d-4ac4-9df3-315882ce9e07}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="charsets.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="codepage_detect.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="CompareOptions.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="CompareStats.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ConfigLog.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ConflictFileParser.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\coretools.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DiffContext.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DiffFileData.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DiffFileInfo.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DiffItem.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DiffItemList.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DiffList.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DiffThread.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DiffWrapper.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DirCmpReport.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DirItem.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DirScan.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DirTravel.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="dllpstub.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Environment.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FileFilter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FileFilterHelper.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FileFilterMgr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FileTextEncoding.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FileTransform.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FileVersion.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FilterCommentsManager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FilterList.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FolderCmp.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="locality.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\lwdisp.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="markdown.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MergeCmdLineInfo.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MovedBlocks.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MovedLines.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\multiformatText.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OptionsInit.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="common\OptionsMgr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PatchHTML.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PathContext.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="paths.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\PidlContainer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PluginManager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Plugins.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ProjectFile.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\RegKey.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\RegOptionsMgr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\ShellFileOperations.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="stringdiffs.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="TempFile.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\unicoder.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\UnicodeString.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\UniFile.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="UniMarkdownFile.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\varprop.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\version.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="VSSHelper.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\analyze.c">
-      <Filter>DiffEngine</Filter>
-    </ClCompile>
-    <ClCompile Include="diffutils\lib\cmpbuf.c">
-      <Filter>DiffEngine</Filter>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\context.c">
-      <Filter>DiffEngine</Filter>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\Diff.cpp">
-      <Filter>DiffEngine</Filter>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\ed.c">
-      <Filter>DiffEngine</Filter>
-    </ClCompile>
-    <ClCompile Include="diffutils\GnuVersion.c">
-      <Filter>DiffEngine</Filter>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\ifdef.c">
-      <Filter>DiffEngine</Filter>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\io.c">
-      <Filter>DiffEngine</Filter>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\normal.c">
-      <Filter>DiffEngine</Filter>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\side.c">
-      <Filter>DiffEngine</Filter>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\util.c">
-      <Filter>DiffEngine</Filter>
-    </ClCompile>
-    <ClCompile Include="CompareEngines\ByteComparator.cpp">
-      <Filter>Compare Engines</Filter>
-    </ClCompile>
-    <ClCompile Include="CompareEngines\ByteCompare.cpp">
-      <Filter>Compare Engines</Filter>
-    </ClCompile>
-    <ClCompile Include="CompareEngines\DiffUtils.cpp">
-      <Filter>Compare Engines</Filter>
-    </ClCompile>
-    <ClCompile Include="CompareEngines\TimeSizeCompare.cpp">
-      <Filter>Compare Engines</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaleditview.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview2.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\ceditreplacedlg.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\LineInfo.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\SyntaxColors.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\UndoRecord.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\ViewableWhitespace.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\cfindtextdlg.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\chcondlg.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\crystaleditviewex.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\crystalparser.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\crystaltextblock.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\cs2cs.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\filesup.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\fpattern.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\gotodlg.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\memcombo.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\registry.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\statbar.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\string_util.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\batch.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\asp.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\basic.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\cplusplus.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\csharp.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\css.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\dcl.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\fortran.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\html.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\ini.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\innosetup.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\java.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\is.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\lisp.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\nsis.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\perl.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\pascal.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\php.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\po.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\powershell.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\python.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\rexx.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\rsrc.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\sgml.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\ruby.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\sh.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\siod.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\sql.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\tcl.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\tex.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\verilog.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\xml.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\cregexp_poco.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="MergeApp.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="7zCommon.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ChildFrm.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\CMoveConstraint.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\ColorButton.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DiffTextBuffer.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DiffViewBar.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DirDoc.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DirFrame.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DirView.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="EditorFilepathBar.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="EncodingErrorBar.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FileActionScript.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FileOrFolderSelect.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FilepathEdit.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="GhostTextBuffer.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="GhostTextView.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="HexMergeDoc.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="HexMergeFrm.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="HexMergeView.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="LocationBar.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="LocationView.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MainFrm.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Merge.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MergeDoc.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MergeDocDiffSync.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MergeDocEncoding.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MergeDocLineDiffs.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MergeEditView.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OpenDoc.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OpenFrm.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OpenView.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="StdAfx.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\LanguageSelect.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\ExConverter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DirCompProgressBar.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OptionsFont.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OptionsSyntaxColors.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OptionsDiffColors.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OptionsDiffOptions.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PropVss.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClCompile>
-    <ClCompile Include="PropArchive.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClCompile>
-    <ClCompile Include="PropBackups.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClCompile>
-    <ClCompile Include="PropCodepage.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClCompile>
-    <ClCompile Include="PropColors.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClCompile>
-    <ClCompile Include="PropCompare.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClCompile>
-    <ClCompile Include="PropCompareFolder.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClCompile>
-    <ClCompile Include="PropEditor.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClCompile>
-    <ClCompile Include="PropGeneral.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClCompile>
-    <ClCompile Include="PropRegistry.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClCompile>
-    <ClCompile Include="PropShell.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClCompile>
-    <ClCompile Include="PropSyntaxColors.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClCompile>
-    <ClCompile Include="PropTextColors.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClCompile>
-    <ClCompile Include="AboutDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="DirCmpReportDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="DirColsDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="LineFiltersDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="LoadSaveCodepageDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="PatchDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="PluginsListDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="ProjectFilePathsDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="SaveClosingDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="SelectUnpackerDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="SharedFilterDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="TestFilterDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="WMGotoDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="FileFiltersDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="CompareStatisticsDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="ConfirmFolderCopyDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="PatchTool.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\SortHeaderCtrl.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\PreferencesDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="JumpList.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\ClipBoard.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OptionsCustomColors.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Merge7zFormatShellImpl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ImgMergeFrm.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PropCompareImage.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClCompile>
-    <ClCompile Include="Merge7zFormatMergePluginImpl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="LineFiltersList.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="CompareEngines\BinaryCompare.cpp">
-      <Filter>Compare Engines</Filter>
-    </ClCompile>
-    <ClCompile Include="PropCompareBinary.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClCompile>
-    <ClCompile Include="SourceControl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DirViewColItems.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DirActions.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DropHandler.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OptionsDef.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OptionsPanel.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\scbarg.cpp">
-      <Filter>MFCGui\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\scbarcf.cpp">
-      <Filter>MFCGui\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\sizecbar.cpp">
-      <Filter>MFCGui\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\BCMenu.cpp">
-      <Filter>MFCGui\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\MDITabBar.cpp">
-      <Filter>MFCGui\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\MessageBoxDialog.cpp">
-      <Filter>MFCGui\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\SuperComboBox.cpp">
-      <Filter>MFCGui\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\SplitterWndEx.cpp">
-      <Filter>MFCGui\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\Bitmap.cpp">
-      <Filter>MFCGui\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\Picture.cpp">
-      <Filter>MFCGui\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="VssPromptDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\ShellContextMenu.cpp">
-      <Filter>MFCGui\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\PropertyPageHost.cpp">
-      <Filter>MFCGui\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="CCPromptDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="TrDialogs.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MergeStatusBar.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\mystat.cpp">
-      <Filter>DiffEngine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\go.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\rust.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="Test.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="TestMain.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\ctextmarkerdlg.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="PropMarkerColors.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="charsets.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="codepage_detect.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="CompareOptions.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="CompareStats.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ConfigLog.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ConflictFileParser.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\coretools.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DiffContext.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DiffFileData.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DiffFileInfo.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DiffItem.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DiffItemList.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DiffList.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DiffThread.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DiffWrapper.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DirCmpReport.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DirItem.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DirReportTypes.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DirScan.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DirTravel.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="dllpstub.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Environment.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Exceptions.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="FileFilter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="FileFilterHelper.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="FileFilterMgr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="FileLocation.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="files.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="FileTextEncoding.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="FileTextStats.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="FileTransform.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="FileVersion.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="FilterCommentsManager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="FilterList.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="FolderCmp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="IAbortable.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="IntToIntMap.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="LineFiltersList.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="locality.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\lwdisp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="markdown.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MergeCmdLineInfo.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MovedLines.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\multiformatText.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OptionsDef.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="common\OptionsMgr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PatchHTML.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PathContext.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="paths.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\PidlContainer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PluginManager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Plugins.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ProjectFile.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\RegKey.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\RegOptionsMgr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\ShellFileOperations.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ssapi.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="stringdiffs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="stringdiffsi.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="TempFile.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\unicoder.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\UnicodeString.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\UniFile.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="UniMarkdownFile.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\varprop.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\version.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="VSSHelper.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="diffutils\lib\cmpbuf.h">
-      <Filter>DiffEngine</Filter>
-    </ClInclude>
-    <ClInclude Include="diffutils\config.h">
-      <Filter>DiffEngine</Filter>
-    </ClInclude>
-    <ClInclude Include="diffutils\src\diff.h">
-      <Filter>DiffEngine</Filter>
-    </ClInclude>
-    <ClInclude Include="diffutils\src\system.h">
-      <Filter>DiffEngine</Filter>
-    </ClInclude>
-    <ClInclude Include="CompareEngines\ByteComparator.h">
-      <Filter>Compare Engines</Filter>
-    </ClInclude>
-    <ClInclude Include="CompareEngines\ByteCompare.h">
-      <Filter>Compare Engines</Filter>
-    </ClInclude>
-    <ClInclude Include="CompareEngines\DiffUtils.h">
-      <Filter>Compare Engines</Filter>
-    </ClInclude>
-    <ClInclude Include="CompareEngines\TimeSizeCompare.h">
-      <Filter>Compare Engines</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaleditview.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextview.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\ceditreplacedlg.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\LineInfo.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\SyntaxColors.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\UndoRecord.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\ViewableWhitespace.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\cfindtextdlg.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\chcondlg.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\cregexp.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\crystaleditviewex.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\crystalparser.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\crystaltextblock.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\cs2cs.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\editcmd.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\editreg.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\edtlib.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\filesup.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\fpattern.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\gotodlg.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\memcombo.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\registry.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\statbar.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\string_util.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\wispelld.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="StdAfx.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Resource.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OpenFrm.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OpenView.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OpenDoc.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MergeEditView.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MergeEditStatus.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MergeDoc.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Merge.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MainFrm.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="LocationView.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="LocationBar.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="IOptionsPanel.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="HexMergeFrm.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="HexMergeDoc.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="GhostTextView.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="GhostTextBuffer.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="FileOrFolderSelect.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ChildFrm.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DiffViewBar.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DiffTextBuffer.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DirDoc.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DirFrame.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DirView.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="EditorFilepathBar.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="EncodingErrorBar.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="FileActionScript.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="FilepathEdit.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\LanguageSelect.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\coretypes.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="IListCtrlImpl.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MergeLineFlags.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MergeApp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\ExConverter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DirCompProgressBar.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Diff3.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OptionsFont.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OptionsSyntaxColors.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OptionsDiffColors.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OptionsDiffOptions.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PropArchive.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClInclude>
-    <ClInclude Include="PropVss.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClInclude>
-    <ClInclude Include="PropBackups.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClInclude>
-    <ClInclude Include="PropCodepage.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClInclude>
-    <ClInclude Include="PropColors.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClInclude>
-    <ClInclude Include="PropCompare.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClInclude>
-    <ClInclude Include="PropCompareFolder.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClInclude>
-    <ClInclude Include="PropEditor.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClInclude>
-    <ClInclude Include="PropGeneral.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClInclude>
-    <ClInclude Include="PropRegistry.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClInclude>
-    <ClInclude Include="PropShell.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClInclude>
-    <ClInclude Include="PropSyntaxColors.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClInclude>
-    <ClInclude Include="PropTextColors.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClInclude>
-    <ClInclude Include="AboutDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="CompareStatisticsDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="ConfirmFolderCopyDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="DirCmpReportDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="FileFiltersDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="LoadSaveCodepageDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="LineFiltersDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="PatchDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="PluginsListDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="SaveClosingDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="SelectUnpackerDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="SharedFilterDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="TestFilterDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="WMGotoDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="ProjectFilePathsDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="DirColsDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="PatchTool.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\PreferencesDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="JumpList.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\ClipBoard.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OptionsCustomColors.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="7zCommon.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Merge7zFormatShellImpl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ImgMergeFrm.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PropCompareImage.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClInclude>
-    <ClInclude Include="IMergeDoc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Merge7zFormatMergePluginImpl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Merge7zFormatRegister.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="CompareEngines\BinaryCompare.h">
-      <Filter>Compare Engines</Filter>
-    </ClInclude>
-    <ClInclude Include="DirViewColItems.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DirActions.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="HexMergeView.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PropCompareBinary.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClInclude>
-    <ClInclude Include="CCPromptDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="VssPromptDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\SuperComboBox.h">
-      <Filter>MFCGui\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\SortHeaderCtrl.h">
-      <Filter>MFCGui\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\CMoveConstraint.h">
-      <Filter>MFCGui\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\MDITabBar.h">
-      <Filter>MFCGui\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\PropertyPageHost.h">
-      <Filter>MFCGui\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\SplitterWndEx.h">
-      <Filter>MFCGui\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\sizecbar.h">
-      <Filter>MFCGui\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\scbarg.h">
-      <Filter>MFCGui\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\scbarcf.h">
-      <Filter>MFCGui\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\MessageBoxDialog.h">
-      <Filter>MFCGui\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="OptionsPanel.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\Bitmap.h">
-      <Filter>MFCGui\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\memdc.h">
-      <Filter>MFCGui\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\ShellContextMenu.h">
-      <Filter>MFCGui\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\BCMenu.h">
-      <Filter>MFCGui\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\ColorButton.h">
-      <Filter>MFCGui\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\Picture.h">
-      <Filter>MFCGui\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="DropHandler.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Constants.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SourceControl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OptionsInit.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="TrDialogs.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MergeStatusBar.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="TestMain.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="PropMarkerColors.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\ctextmarkerdlg.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="res\binarydiff.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\both.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\equalbinary.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\equalfile.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\error.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\fileskip.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\folder.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\folderskip.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\folderup.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\folderup_disable.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\hand.cur">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\left.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\left_to_browse.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\left_to_right.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\lfile.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\lfolder.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\Merge.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\Merge.rc2">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\MergeDir.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\MergeDoc.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\MergeProject.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\mg_cur.cur">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\move_left_to_browse.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\move_right_to_browse.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\notequalfile.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\rfile.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\rfolder.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\right.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\right_to_browse.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\right_to_left.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\sigma.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="CHANGELO">
-      <Filter>ChangeLogs</Filter>
-    </None>
-    <None Include="..\Docs\Users\ChangeLog.txt">
-      <Filter>ChangeLogs</Filter>
-    </None>
-    <None Include="..\Externals\crystaledit\editlib\ccrystaleditview.inl">
-      <Filter>EditLib</Filter>
-    </None>
-    <None Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.inl">
-      <Filter>EditLib</Filter>
-    </None>
-    <None Include="..\Externals\crystaledit\editlib\ccrystaltextview.inl">
-      <Filter>EditLib</Filter>
-    </None>
-    <None Include="..\Externals\crystaledit\editlib\filesup.inl">
-      <Filter>EditLib</Filter>
-    </None>
-    <None Include="..\Externals\crystaledit\editlib\memcombo.inl">
-      <Filter>EditLib</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="Merge.rc">
-      <Filter>MFCGui\Source Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{e8f63c02-8bf9-425d-88d0-831ca188bbdf}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{ff78af1d-3eee-4c01-8be1-27cf73dfe922}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{4e04f59d-bb70-4e67-a8d7-2b01fb6d0cd8}</UniqueIdentifier>\r
+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>\r
+    </Filter>\r
+    <Filter Include="EditLib">\r
+      <UniqueIdentifier>{84d4664c-e7ea-4d24-8d55-b1303c40b7f4}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="DiffEngine">\r
+      <UniqueIdentifier>{16e1af2b-75c9-4deb-b49f-819018df0478}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="ChangeLogs">\r
+      <UniqueIdentifier>{aefb7247-d6e5-411d-9cc5-4a12f5efda4a}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="Compare Engines">\r
+      <UniqueIdentifier>{b889169f-de55-4db7-ad06-423f6438fa90}</UniqueIdentifier>\r
+      <Extensions>cpp;c;h</Extensions>\r
+    </Filter>\r
+    <Filter Include="EditLib\parsers">\r
+      <UniqueIdentifier>{740d4dd9-ab31-47b8-9cbb-8e6a7b5db4fe}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui">\r
+      <UniqueIdentifier>{caf52667-921a-47aa-84a3-f277aac15107}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\Source Files">\r
+      <UniqueIdentifier>{5dc3ba0d-6755-48f8-ad11-df56b167b514}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\Header Files">\r
+      <UniqueIdentifier>{10ce7aff-bcfd-4ed0-98c3-766226c4c89e}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\Dialogs">\r
+      <UniqueIdentifier>{d520b3a7-c530-4053-8766-07c26ed85f85}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\Dialogs\PropertyPages">\r
+      <UniqueIdentifier>{c6b39fdf-7c68-42c3-895b-da25bb6e51b4}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\Common">\r
+      <UniqueIdentifier>{297182f0-e39d-4ac4-9df3-315882ce9e07}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="charsets.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="codepage_detect.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareOptions.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareStats.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="ConfigLog.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="ConflictFileParser.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\coretools.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffContext.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffFileData.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffFileInfo.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffItem.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffItemList.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffList.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffThread.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffWrapper.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DirCmpReport.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DirItem.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DirScan.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DirTravel.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="dllpstub.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Environment.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="FileFilter.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="FileFilterHelper.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="FileFilterMgr.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="FileTextEncoding.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="FileTransform.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="FileVersion.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="FilterCommentsManager.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="FilterList.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="FolderCmp.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="locality.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\lwdisp.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="markdown.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="MergeCmdLineInfo.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="MovedBlocks.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="MovedLines.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\multiformatText.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="OptionsInit.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="common\OptionsMgr.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PatchHTML.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PathContext.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="paths.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\PidlContainer.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PluginManager.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Plugins.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="ProjectFile.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\RegKey.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\RegOptionsMgr.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\ShellFileOperations.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="stringdiffs.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="TempFile.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\unicoder.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\UnicodeString.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\UniFile.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="UniMarkdownFile.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\varprop.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\version.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="VSSHelper.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="diffutils\src\analyze.c">\r
+      <Filter>DiffEngine</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="diffutils\lib\cmpbuf.c">\r
+      <Filter>DiffEngine</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="diffutils\src\context.c">\r
+      <Filter>DiffEngine</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="diffutils\src\Diff.cpp">\r
+      <Filter>DiffEngine</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="diffutils\src\ed.c">\r
+      <Filter>DiffEngine</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="diffutils\GnuVersion.c">\r
+      <Filter>DiffEngine</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="diffutils\src\ifdef.c">\r
+      <Filter>DiffEngine</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="diffutils\src\io.c">\r
+      <Filter>DiffEngine</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="diffutils\src\normal.c">\r
+      <Filter>DiffEngine</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="diffutils\src\side.c">\r
+      <Filter>DiffEngine</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="diffutils\src\util.c">\r
+      <Filter>DiffEngine</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareEngines\ByteComparator.cpp">\r
+      <Filter>Compare Engines</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareEngines\ByteCompare.cpp">\r
+      <Filter>Compare Engines</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareEngines\DiffUtils.cpp">\r
+      <Filter>Compare Engines</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareEngines\TimeSizeCompare.cpp">\r
+      <Filter>Compare Engines</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaleditview.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview2.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ceditreplacedlg.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\LineInfo.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\SyntaxColors.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\UndoRecord.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ViewableWhitespace.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\cfindtextdlg.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\chcondlg.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\crystaleditviewex.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\crystalparser.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\crystaltextblock.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\cs2cs.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\filesup.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\fpattern.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\gotodlg.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\memcombo.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\registry.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\statbar.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\string_util.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\batch.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\asp.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\basic.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\cplusplus.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\csharp.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\css.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\dcl.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\fortran.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\html.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ini.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\innosetup.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\java.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\is.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\lisp.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\nsis.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\perl.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\pascal.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\php.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\po.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\powershell.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\python.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\rexx.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\rsrc.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\sgml.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ruby.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\sh.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\siod.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\sql.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\tcl.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\tex.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\verilog.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\xml.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\cregexp_poco.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="MergeApp.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="7zCommon.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="ChildFrm.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\CMoveConstraint.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\ColorButton.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffTextBuffer.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffViewBar.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DirDoc.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DirFrame.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DirView.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="EditorFilepathBar.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="EncodingErrorBar.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="FileActionScript.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="FileOrFolderSelect.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="FilepathEdit.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="GhostTextBuffer.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="GhostTextView.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="HexMergeDoc.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="HexMergeFrm.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="HexMergeView.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="LocationBar.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="LocationView.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="MainFrm.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Merge.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="MergeDoc.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="MergeDocDiffSync.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="MergeDocEncoding.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="MergeDocLineDiffs.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="MergeEditView.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="OpenDoc.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="OpenFrm.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="OpenView.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="StdAfx.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\LanguageSelect.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\ExConverter.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DirCompProgressBar.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="OptionsFont.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="OptionsSyntaxColors.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="OptionsDiffColors.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="OptionsDiffOptions.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropVss.cpp">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropArchive.cpp">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropBackups.cpp">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropCodepage.cpp">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropColors.cpp">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropCompare.cpp">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropCompareFolder.cpp">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropEditor.cpp">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropGeneral.cpp">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropRegistry.cpp">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropShell.cpp">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropSyntaxColors.cpp">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropTextColors.cpp">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="AboutDlg.cpp">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DirCmpReportDlg.cpp">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DirColsDlg.cpp">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="LineFiltersDlg.cpp">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="LoadSaveCodepageDlg.cpp">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PatchDlg.cpp">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PluginsListDlg.cpp">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="ProjectFilePathsDlg.cpp">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="SaveClosingDlg.cpp">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="SelectUnpackerDlg.cpp">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="SharedFilterDlg.cpp">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="TestFilterDlg.cpp">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="WMGotoDlg.cpp">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="FileFiltersDlg.cpp">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareStatisticsDlg.cpp">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="ConfirmFolderCopyDlg.cpp">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PatchTool.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\SortHeaderCtrl.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\PreferencesDlg.cpp">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="JumpList.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\ClipBoard.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="OptionsCustomColors.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Merge7zFormatShellImpl.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="ImgMergeFrm.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropCompareImage.cpp">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Merge7zFormatMergePluginImpl.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="LineFiltersList.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareEngines\BinaryCompare.cpp">\r
+      <Filter>Compare Engines</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropCompareBinary.cpp">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="SourceControl.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DirViewColItems.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DirActions.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DropHandler.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="OptionsDef.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="OptionsPanel.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\scbarg.cpp">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\scbarcf.cpp">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\sizecbar.cpp">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\BCMenu.cpp">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\MDITabBar.cpp">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\MessageBoxDialog.cpp">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\SuperComboBox.cpp">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\SplitterWndEx.cpp">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\Bitmap.cpp">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\Picture.cpp">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="VssPromptDlg.cpp">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\ShellContextMenu.cpp">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\PropertyPageHost.cpp">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="CCPromptDlg.cpp">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="TrDialogs.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="MergeStatusBar.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Test.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="TestMain.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="diffutils\src\mystat.cpp">\r
+      <Filter>DiffEngine</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\go.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\rust.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ctextmarkerdlg.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropMarkerColors.cpp">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="charsets.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="codepage_detect.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="CompareOptions.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="CompareStats.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="ConfigLog.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="ConflictFileParser.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\coretools.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DiffContext.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DiffFileData.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DiffFileInfo.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DiffItem.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DiffItemList.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DiffList.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DiffThread.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DiffWrapper.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DirCmpReport.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DirItem.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DirReportTypes.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DirScan.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DirTravel.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="dllpstub.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Environment.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Exceptions.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="FileFilter.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="FileFilterHelper.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="FileFilterMgr.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="FileLocation.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="files.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="FileTextEncoding.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="FileTextStats.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="FileTransform.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="FileVersion.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="FilterCommentsManager.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="FilterList.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="FolderCmp.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="IAbortable.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="IntToIntMap.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="LineFiltersList.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="locality.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\lwdisp.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="markdown.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="MergeCmdLineInfo.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="MovedLines.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\multiformatText.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="OptionsDef.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="common\OptionsMgr.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PatchHTML.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PathContext.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="paths.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\PidlContainer.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PluginManager.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Plugins.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="ProjectFile.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\RegKey.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\RegOptionsMgr.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\ShellFileOperations.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="ssapi.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="stringdiffs.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="stringdiffsi.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="TempFile.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\unicoder.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\UnicodeString.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\UniFile.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="UniMarkdownFile.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\varprop.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\version.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="VSSHelper.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="diffutils\lib\cmpbuf.h">\r
+      <Filter>DiffEngine</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="diffutils\config.h">\r
+      <Filter>DiffEngine</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="diffutils\src\diff.h">\r
+      <Filter>DiffEngine</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="diffutils\src\system.h">\r
+      <Filter>DiffEngine</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="CompareEngines\ByteComparator.h">\r
+      <Filter>Compare Engines</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="CompareEngines\ByteCompare.h">\r
+      <Filter>Compare Engines</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="CompareEngines\DiffUtils.h">\r
+      <Filter>Compare Engines</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="CompareEngines\TimeSizeCompare.h">\r
+      <Filter>Compare Engines</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaleditview.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextview.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\ceditreplacedlg.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\LineInfo.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\SyntaxColors.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\UndoRecord.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\ViewableWhitespace.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\cfindtextdlg.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\chcondlg.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\cregexp.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\crystaleditviewex.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\crystalparser.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\crystaltextblock.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\cs2cs.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\editcmd.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\editreg.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\edtlib.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\filesup.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\fpattern.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\gotodlg.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\memcombo.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\registry.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\statbar.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\string_util.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\wispelld.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="StdAfx.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Resource.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="OpenFrm.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="OpenView.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="OpenDoc.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="MergeEditView.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="MergeEditStatus.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="MergeDoc.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Merge.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="MainFrm.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="LocationView.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="LocationBar.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="IOptionsPanel.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="HexMergeFrm.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="HexMergeDoc.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="GhostTextView.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="GhostTextBuffer.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="FileOrFolderSelect.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="ChildFrm.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DiffViewBar.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DiffTextBuffer.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DirDoc.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DirFrame.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DirView.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="EditorFilepathBar.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="EncodingErrorBar.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="FileActionScript.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="FilepathEdit.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\LanguageSelect.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\coretypes.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="IListCtrlImpl.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="MergeLineFlags.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="MergeApp.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\ExConverter.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DirCompProgressBar.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Diff3.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="OptionsFont.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="OptionsSyntaxColors.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="OptionsDiffColors.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="OptionsDiffOptions.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropArchive.h">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropVss.h">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropBackups.h">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropCodepage.h">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropColors.h">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropCompare.h">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropCompareFolder.h">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropEditor.h">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropGeneral.h">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropRegistry.h">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropShell.h">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropSyntaxColors.h">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropTextColors.h">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="AboutDlg.h">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="CompareStatisticsDlg.h">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="ConfirmFolderCopyDlg.h">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DirCmpReportDlg.h">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="FileFiltersDlg.h">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="LoadSaveCodepageDlg.h">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="LineFiltersDlg.h">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PatchDlg.h">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PluginsListDlg.h">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="SaveClosingDlg.h">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="SelectUnpackerDlg.h">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="SharedFilterDlg.h">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="TestFilterDlg.h">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="WMGotoDlg.h">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="ProjectFilePathsDlg.h">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DirColsDlg.h">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PatchTool.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\PreferencesDlg.h">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="JumpList.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\ClipBoard.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="OptionsCustomColors.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="7zCommon.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Merge7zFormatShellImpl.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="ImgMergeFrm.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropCompareImage.h">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="IMergeDoc.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Merge7zFormatMergePluginImpl.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Merge7zFormatRegister.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="CompareEngines\BinaryCompare.h">\r
+      <Filter>Compare Engines</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DirViewColItems.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DirActions.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="HexMergeView.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropCompareBinary.h">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="CCPromptDlg.h">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="VssPromptDlg.h">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\SuperComboBox.h">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\SortHeaderCtrl.h">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\CMoveConstraint.h">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\MDITabBar.h">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\PropertyPageHost.h">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\SplitterWndEx.h">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\sizecbar.h">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\scbarg.h">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\scbarcf.h">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\MessageBoxDialog.h">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="OptionsPanel.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\Bitmap.h">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\memdc.h">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\ShellContextMenu.h">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\BCMenu.h">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\ColorButton.h">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\Picture.h">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DropHandler.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Constants.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="SourceControl.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="OptionsInit.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="TrDialogs.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="MergeStatusBar.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="TestMain.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropMarkerColors.h">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\ctextmarkerdlg.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="res\binarydiff.ico">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\both.bmp">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\equalbinary.ico">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\equalfile.ico">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\error.ico">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\fileskip.ico">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\folder.ico">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\folderskip.ico">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\folderup.ico">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\folderup_disable.ico">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\hand.cur">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\left.bmp">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\left_to_browse.bmp">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\left_to_right.bmp">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\lfile.ico">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\lfolder.ico">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\Merge.ico">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\Merge.rc2">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\MergeDir.ico">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\MergeDoc.ico">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\MergeProject.ico">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\mg_cur.cur">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\move_left_to_browse.bmp">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\move_right_to_browse.bmp">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\notequalfile.ico">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\rfile.ico">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\rfolder.ico">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\right.bmp">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\right_to_browse.bmp">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\right_to_left.bmp">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\sigma.ico">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="CHANGELO">\r
+      <Filter>ChangeLogs</Filter>\r
+    </None>\r
+    <None Include="..\Docs\Users\ChangeLog.txt">\r
+      <Filter>ChangeLogs</Filter>\r
+    </None>\r
+    <None Include="..\Externals\crystaledit\editlib\ccrystaleditview.inl">\r
+      <Filter>EditLib</Filter>\r
+    </None>\r
+    <None Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.inl">\r
+      <Filter>EditLib</Filter>\r
+    </None>\r
+    <None Include="..\Externals\crystaledit\editlib\ccrystaltextview.inl">\r
+      <Filter>EditLib</Filter>\r
+    </None>\r
+    <None Include="..\Externals\crystaledit\editlib\filesup.inl">\r
+      <Filter>EditLib</Filter>\r
+    </None>\r
+    <None Include="..\Externals\crystaledit\editlib\memcombo.inl">\r
+      <Filter>EditLib</Filter>\r
+    </None>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ResourceCompile Include="Merge.rc">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ResourceCompile>\r
+  </ItemGroup>\r
 </Project>
\ No newline at end of file
diff --git a/WinMerge.sln b/WinMerge.sln
deleted file mode 100644 (file)
index 5f4b915..0000000
--- a/WinMerge.sln
+++ /dev/null
@@ -1,264 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00\r
-# Visual Studio 15\r
-VisualStudioVersion = 15.0.26228.4\r
-MinimumVisualStudioVersion = 10.0.40219.1\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Merge", "Src\Merge.vcxproj", "{9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}"\r
-       ProjectSection(ProjectDependencies) = postProject\r
-               {8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176}\r
-               {9E211743-85FE-4977-82F3-4F04B40C912D} = {9E211743-85FE-4977-82F3-4F04B40C912D}\r
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C} = {6FF56CDB-787A-4714-A28C-919003F9FA6C}\r
-       EndProjectSection\r
-EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MergeLang", "Src\MergeLang.vcxproj", "{4B011DDA-2279-437D-903C-8028913AF31B}"\r
-EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Foundation", "Externals\poco\Foundation\Foundation_vs100.vcxproj", "{8164D41D-B053-405B-826C-CF37AC0EF176}"\r
-EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XML", "Externals\poco\XML\XML_vs100.vcxproj", "{9E211743-85FE-4977-82F3-4F04B40C912D}"\r
-EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Util", "Externals\poco\Util\Util_vs100.vcxproj", "{6FF56CDB-787A-4714-A28C-919003F9FA6C}"\r
-EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests", "Testing\GoogleTest\UnitTests\UnitTests.vcxproj", "{733E7C0B-AC3D-47AC-A8DA-E13644D6294D}"\r
-       ProjectSection(ProjectDependencies) = postProject\r
-               {8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176}\r
-               {9E211743-85FE-4977-82F3-4F04B40C912D} = {9E211743-85FE-4977-82F3-4F04B40C912D}\r
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C} = {6FF56CDB-787A-4714-A28C-919003F9FA6C}\r
-       EndProjectSection\r
-EndProject\r
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Poco", "Poco", "{220B870C-D051-463E-997B-8C392081EE15}"\r
-EndProject\r
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Batch Files", "Batch Files", "{DC3B258E-444F-460D-8FD9-09A8165212FA}"\r
-       ProjectSection(SolutionItems) = preProject\r
-               BuildAll2.cmd = BuildAll2.cmd\r
-               BuildArc.cmd = BuildArc.cmd\r
-               BuildBin.cmd = BuildBin.cmd\r
-               BuildInstaller.cmd = BuildInstaller.cmd\r
-               BuildManual.cmd = BuildManual.cmd\r
-               SetVersion.cmd = SetVersion.cmd\r
-               UploadToGithub.cmd = UploadToGithub.cmd\r
-               UploadToVirusTotal.cmd = UploadToVirusTotal.cmd\r
-       EndProjectSection\r
-EndProject\r
-Global\r
-       GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
-               Debug Unicode|Win32 = Debug Unicode|Win32\r
-               Debug Unicode|x64 = Debug Unicode|x64\r
-               debug_shared|Win32 = debug_shared|Win32\r
-               debug_shared|x64 = debug_shared|x64\r
-               debug_static_md|Win32 = debug_static_md|Win32\r
-               debug_static_md|x64 = debug_static_md|x64\r
-               debug_static_mt|Win32 = debug_static_mt|Win32\r
-               debug_static_mt|x64 = debug_static_mt|x64\r
-               Release Unicode|Win32 = Release Unicode|Win32\r
-               Release Unicode|x64 = Release Unicode|x64\r
-               release_shared|Win32 = release_shared|Win32\r
-               release_shared|x64 = release_shared|x64\r
-               release_static_md|Win32 = release_static_md|Win32\r
-               release_static_md|x64 = release_static_md|x64\r
-               release_static_mt|Win32 = release_static_mt|Win32\r
-               release_static_mt|x64 = release_static_mt|x64\r
-               Test|Win32 = Test|Win32\r
-               Test|x64 = Test|x64\r
-       EndGlobalSection\r
-       GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug Unicode|Win32.ActiveCfg = UnicodeDebug|Win32\r
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug Unicode|Win32.Build.0 = UnicodeDebug|Win32\r
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug Unicode|x64.ActiveCfg = UnicodeDebug|x64\r
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug Unicode|x64.Build.0 = UnicodeDebug|x64\r
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.debug_shared|Win32.ActiveCfg = UnicodeDebug|Win32\r
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.debug_shared|Win32.Build.0 = UnicodeDebug|Win32\r
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.debug_shared|x64.ActiveCfg = UnicodeRelease|x64\r
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.debug_shared|x64.Build.0 = UnicodeRelease|x64\r
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.debug_static_md|Win32.ActiveCfg = UnicodeRelease|Win32\r
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.debug_static_md|Win32.Build.0 = UnicodeRelease|Win32\r
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.debug_static_md|x64.ActiveCfg = UnicodeRelease|x64\r
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.debug_static_md|x64.Build.0 = UnicodeRelease|x64\r
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.debug_static_mt|Win32.ActiveCfg = UnicodeRelease|Win32\r
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.debug_static_mt|Win32.Build.0 = UnicodeRelease|Win32\r
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.debug_static_mt|x64.ActiveCfg = UnicodeRelease|x64\r
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.debug_static_mt|x64.Build.0 = UnicodeRelease|x64\r
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release Unicode|Win32.ActiveCfg = UnicodeRelease|Win32\r
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release Unicode|Win32.Build.0 = UnicodeRelease|Win32\r
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release Unicode|x64.ActiveCfg = UnicodeRelease|x64\r
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release Unicode|x64.Build.0 = UnicodeRelease|x64\r
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.release_shared|Win32.ActiveCfg = UnicodeRelease|Win32\r
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.release_shared|Win32.Build.0 = UnicodeRelease|Win32\r
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.release_shared|x64.ActiveCfg = UnicodeRelease|x64\r
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.release_shared|x64.Build.0 = UnicodeRelease|x64\r
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.release_static_md|Win32.ActiveCfg = UnicodeRelease|Win32\r
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.release_static_md|Win32.Build.0 = UnicodeRelease|Win32\r
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.release_static_md|x64.ActiveCfg = UnicodeRelease|x64\r
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.release_static_md|x64.Build.0 = UnicodeRelease|x64\r
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.release_static_mt|Win32.ActiveCfg = UnicodeRelease|Win32\r
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.release_static_mt|Win32.Build.0 = UnicodeRelease|Win32\r
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.release_static_mt|x64.ActiveCfg = UnicodeRelease|x64\r
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.release_static_mt|x64.Build.0 = UnicodeRelease|x64\r
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Test|Win32.ActiveCfg = Test|Win32\r
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Test|Win32.Build.0 = Test|Win32\r
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Test|x64.ActiveCfg = Test|x64\r
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Test|x64.Build.0 = Test|x64\r
-               {4B011DDA-2279-437D-903C-8028913AF31B}.Debug Unicode|Win32.ActiveCfg = UnicodeDebug|Win32\r
-               {4B011DDA-2279-437D-903C-8028913AF31B}.Debug Unicode|Win32.Build.0 = UnicodeDebug|Win32\r
-               {4B011DDA-2279-437D-903C-8028913AF31B}.Debug Unicode|x64.ActiveCfg = UnicodeDebug|x64\r
-               {4B011DDA-2279-437D-903C-8028913AF31B}.Debug Unicode|x64.Build.0 = UnicodeDebug|x64\r
-               {4B011DDA-2279-437D-903C-8028913AF31B}.debug_shared|Win32.ActiveCfg = UnicodeDebug|Win32\r
-               {4B011DDA-2279-437D-903C-8028913AF31B}.debug_shared|Win32.Build.0 = UnicodeDebug|Win32\r
-               {4B011DDA-2279-437D-903C-8028913AF31B}.debug_shared|x64.ActiveCfg = UnicodeRelease|x64\r
-               {4B011DDA-2279-437D-903C-8028913AF31B}.debug_shared|x64.Build.0 = UnicodeRelease|x64\r
-               {4B011DDA-2279-437D-903C-8028913AF31B}.debug_static_md|Win32.ActiveCfg = UnicodeRelease|Win32\r
-               {4B011DDA-2279-437D-903C-8028913AF31B}.debug_static_md|Win32.Build.0 = UnicodeRelease|Win32\r
-               {4B011DDA-2279-437D-903C-8028913AF31B}.debug_static_md|x64.ActiveCfg = UnicodeRelease|x64\r
-               {4B011DDA-2279-437D-903C-8028913AF31B}.debug_static_md|x64.Build.0 = UnicodeRelease|x64\r
-               {4B011DDA-2279-437D-903C-8028913AF31B}.debug_static_mt|Win32.ActiveCfg = UnicodeRelease|Win32\r
-               {4B011DDA-2279-437D-903C-8028913AF31B}.debug_static_mt|Win32.Build.0 = UnicodeRelease|Win32\r
-               {4B011DDA-2279-437D-903C-8028913AF31B}.debug_static_mt|x64.ActiveCfg = UnicodeRelease|x64\r
-               {4B011DDA-2279-437D-903C-8028913AF31B}.debug_static_mt|x64.Build.0 = UnicodeRelease|x64\r
-               {4B011DDA-2279-437D-903C-8028913AF31B}.Release Unicode|Win32.ActiveCfg = UnicodeRelease|Win32\r
-               {4B011DDA-2279-437D-903C-8028913AF31B}.Release Unicode|Win32.Build.0 = UnicodeRelease|Win32\r
-               {4B011DDA-2279-437D-903C-8028913AF31B}.Release Unicode|x64.ActiveCfg = UnicodeRelease|x64\r
-               {4B011DDA-2279-437D-903C-8028913AF31B}.Release Unicode|x64.Build.0 = UnicodeRelease|x64\r
-               {4B011DDA-2279-437D-903C-8028913AF31B}.release_shared|Win32.ActiveCfg = UnicodeRelease|Win32\r
-               {4B011DDA-2279-437D-903C-8028913AF31B}.release_shared|Win32.Build.0 = UnicodeRelease|Win32\r
-               {4B011DDA-2279-437D-903C-8028913AF31B}.release_shared|x64.ActiveCfg = UnicodeRelease|x64\r
-               {4B011DDA-2279-437D-903C-8028913AF31B}.release_shared|x64.Build.0 = UnicodeRelease|x64\r
-               {4B011DDA-2279-437D-903C-8028913AF31B}.release_static_md|Win32.ActiveCfg = UnicodeRelease|Win32\r
-               {4B011DDA-2279-437D-903C-8028913AF31B}.release_static_md|Win32.Build.0 = UnicodeRelease|Win32\r
-               {4B011DDA-2279-437D-903C-8028913AF31B}.release_static_md|x64.ActiveCfg = UnicodeRelease|x64\r
-               {4B011DDA-2279-437D-903C-8028913AF31B}.release_static_md|x64.Build.0 = UnicodeRelease|x64\r
-               {4B011DDA-2279-437D-903C-8028913AF31B}.release_static_mt|Win32.ActiveCfg = UnicodeRelease|Win32\r
-               {4B011DDA-2279-437D-903C-8028913AF31B}.release_static_mt|Win32.Build.0 = UnicodeRelease|Win32\r
-               {4B011DDA-2279-437D-903C-8028913AF31B}.release_static_mt|x64.ActiveCfg = UnicodeRelease|x64\r
-               {4B011DDA-2279-437D-903C-8028913AF31B}.release_static_mt|x64.Build.0 = UnicodeRelease|x64\r
-               {4B011DDA-2279-437D-903C-8028913AF31B}.Test|Win32.ActiveCfg = UnicodeRelease|Win32\r
-               {4B011DDA-2279-437D-903C-8028913AF31B}.Test|Win32.Build.0 = UnicodeRelease|Win32\r
-               {4B011DDA-2279-437D-903C-8028913AF31B}.Test|x64.ActiveCfg = UnicodeDebug|x64\r
-               {4B011DDA-2279-437D-903C-8028913AF31B}.Test|x64.Build.0 = UnicodeDebug|x64\r
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.Debug Unicode|Win32.ActiveCfg = debug_static_mt|Win32\r
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.Debug Unicode|Win32.Build.0 = debug_static_mt|Win32\r
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.Debug Unicode|x64.ActiveCfg = debug_static_mt|x64\r
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.Debug Unicode|x64.Build.0 = debug_static_mt|x64\r
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.debug_shared|Win32.ActiveCfg = debug_shared|Win32\r
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.debug_shared|Win32.Build.0 = debug_shared|Win32\r
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.debug_shared|x64.ActiveCfg = debug_shared|Win32\r
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32\r
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_md|Win32.Build.0 = debug_static_md|Win32\r
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_md|x64.ActiveCfg = debug_static_md|Win32\r
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32\r
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32\r
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_mt|x64.ActiveCfg = debug_static_mt|Win32\r
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.Release Unicode|Win32.ActiveCfg = release_static_mt|Win32\r
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.Release Unicode|Win32.Build.0 = release_static_mt|Win32\r
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.Release Unicode|x64.ActiveCfg = release_static_mt|x64\r
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.Release Unicode|x64.Build.0 = release_static_mt|x64\r
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.release_shared|Win32.ActiveCfg = release_shared|Win32\r
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.release_shared|Win32.Build.0 = release_shared|Win32\r
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.release_shared|x64.ActiveCfg = release_shared|Win32\r
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_md|Win32.ActiveCfg = release_static_md|Win32\r
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_md|Win32.Build.0 = release_static_md|Win32\r
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_md|x64.ActiveCfg = release_static_md|Win32\r
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32\r
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_mt|Win32.Build.0 = release_static_mt|Win32\r
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_mt|x64.ActiveCfg = release_static_mt|Win32\r
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.Test|Win32.ActiveCfg = release_static_md|Win32\r
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.Test|Win32.Build.0 = release_static_md|Win32\r
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.Test|x64.ActiveCfg = debug_static_mt|x64\r
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.Test|x64.Build.0 = debug_static_mt|x64\r
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.Debug Unicode|Win32.ActiveCfg = debug_static_mt|Win32\r
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.Debug Unicode|Win32.Build.0 = debug_static_mt|Win32\r
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.Debug Unicode|x64.ActiveCfg = debug_static_mt|x64\r
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.Debug Unicode|x64.Build.0 = debug_static_mt|x64\r
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.debug_shared|Win32.ActiveCfg = debug_shared|Win32\r
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.debug_shared|Win32.Build.0 = debug_shared|Win32\r
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.debug_shared|x64.ActiveCfg = debug_shared|Win32\r
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32\r
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.debug_static_md|Win32.Build.0 = debug_static_md|Win32\r
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.debug_static_md|x64.ActiveCfg = debug_static_md|Win32\r
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32\r
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32\r
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.debug_static_mt|x64.ActiveCfg = debug_static_mt|Win32\r
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.Release Unicode|Win32.ActiveCfg = release_static_mt|Win32\r
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.Release Unicode|Win32.Build.0 = release_static_mt|Win32\r
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.Release Unicode|x64.ActiveCfg = release_static_mt|x64\r
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.Release Unicode|x64.Build.0 = release_static_mt|x64\r
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.release_shared|Win32.ActiveCfg = release_shared|Win32\r
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.release_shared|Win32.Build.0 = release_shared|Win32\r
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.release_shared|x64.ActiveCfg = release_shared|Win32\r
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.release_static_md|Win32.ActiveCfg = release_static_md|Win32\r
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.release_static_md|Win32.Build.0 = release_static_md|Win32\r
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.release_static_md|x64.ActiveCfg = release_static_md|Win32\r
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32\r
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.release_static_mt|Win32.Build.0 = release_static_mt|Win32\r
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.release_static_mt|x64.ActiveCfg = release_static_mt|Win32\r
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.Test|Win32.ActiveCfg = release_static_md|Win32\r
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.Test|Win32.Build.0 = release_static_md|Win32\r
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.Test|x64.ActiveCfg = debug_static_mt|x64\r
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.Test|x64.Build.0 = debug_static_mt|x64\r
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Debug Unicode|Win32.ActiveCfg = debug_static_mt|Win32\r
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Debug Unicode|Win32.Build.0 = debug_static_mt|Win32\r
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Debug Unicode|x64.ActiveCfg = debug_static_mt|x64\r
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Debug Unicode|x64.Build.0 = debug_static_mt|x64\r
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_shared|Win32.ActiveCfg = debug_shared|Win32\r
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_shared|Win32.Build.0 = debug_shared|Win32\r
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_shared|x64.ActiveCfg = debug_shared|Win32\r
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32\r
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_static_md|Win32.Build.0 = debug_static_md|Win32\r
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_static_md|x64.ActiveCfg = debug_static_md|Win32\r
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32\r
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32\r
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_static_mt|x64.ActiveCfg = debug_static_mt|Win32\r
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Release Unicode|Win32.ActiveCfg = release_static_mt|Win32\r
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Release Unicode|Win32.Build.0 = release_static_mt|Win32\r
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Release Unicode|x64.ActiveCfg = release_static_mt|x64\r
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Release Unicode|x64.Build.0 = release_static_mt|x64\r
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_shared|Win32.ActiveCfg = release_shared|Win32\r
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_shared|Win32.Build.0 = release_shared|Win32\r
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_shared|x64.ActiveCfg = release_shared|Win32\r
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_static_md|Win32.ActiveCfg = release_static_md|Win32\r
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_static_md|Win32.Build.0 = release_static_md|Win32\r
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_static_md|x64.ActiveCfg = release_static_md|Win32\r
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32\r
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_static_mt|Win32.Build.0 = release_static_mt|Win32\r
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_static_mt|x64.ActiveCfg = release_static_mt|Win32\r
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Test|Win32.ActiveCfg = release_static_md|Win32\r
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Test|Win32.Build.0 = release_static_md|Win32\r
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Test|x64.ActiveCfg = debug_static_mt|x64\r
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Test|x64.Build.0 = debug_static_mt|x64\r
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Debug Unicode|Win32.ActiveCfg = Debug|Win32\r
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Debug Unicode|Win32.Build.0 = Debug|Win32\r
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Debug Unicode|x64.ActiveCfg = Debug|x64\r
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Debug Unicode|x64.Build.0 = Debug|x64\r
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.debug_shared|Win32.ActiveCfg = Debug|Win32\r
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.debug_shared|Win32.Build.0 = Debug|Win32\r
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.debug_shared|x64.ActiveCfg = Debug|Win32\r
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.debug_static_md|Win32.ActiveCfg = Debug|Win32\r
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.debug_static_md|Win32.Build.0 = Debug|Win32\r
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.debug_static_md|x64.ActiveCfg = Debug|Win32\r
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.debug_static_mt|Win32.ActiveCfg = Debug|Win32\r
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.debug_static_mt|Win32.Build.0 = Debug|Win32\r
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.debug_static_mt|x64.ActiveCfg = Debug|Win32\r
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Release Unicode|Win32.ActiveCfg = Release|Win32\r
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Release Unicode|Win32.Build.0 = Release|Win32\r
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Release Unicode|x64.ActiveCfg = Release|x64\r
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Release Unicode|x64.Build.0 = Release|x64\r
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.release_shared|Win32.ActiveCfg = Release|Win32\r
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.release_shared|Win32.Build.0 = Release|Win32\r
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.release_shared|x64.ActiveCfg = Release|Win32\r
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.release_static_md|Win32.ActiveCfg = Release|Win32\r
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.release_static_md|Win32.Build.0 = Release|Win32\r
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.release_static_md|x64.ActiveCfg = Release|Win32\r
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.release_static_mt|Win32.ActiveCfg = Release|Win32\r
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.release_static_mt|Win32.Build.0 = Release|Win32\r
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.release_static_mt|x64.ActiveCfg = Release|Win32\r
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Test|Win32.ActiveCfg = Release|Win32\r
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Test|Win32.Build.0 = Release|Win32\r
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Test|x64.ActiveCfg = Debug|x64\r
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Test|x64.Build.0 = Debug|x64\r
-       EndGlobalSection\r
-       GlobalSection(SolutionProperties) = preSolution\r
-               HideSolutionNode = FALSE\r
-       EndGlobalSection\r
-       GlobalSection(NestedProjects) = preSolution\r
-               {8164D41D-B053-405B-826C-CF37AC0EF176} = {220B870C-D051-463E-997B-8C392081EE15}\r
-               {9E211743-85FE-4977-82F3-4F04B40C912D} = {220B870C-D051-463E-997B-8C392081EE15}\r
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C} = {220B870C-D051-463E-997B-8C392081EE15}\r
-       EndGlobalSection\r
-EndGlobal\r
diff --git a/WinMerge.vs2015.sln b/WinMerge.vs2015.sln
index 79b113b..dd31cee 100644 (file)
--- a/WinMerge.vs2015.sln
+++ b/WinMerge.vs2015.sln
@@ -1,115 +1,114 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Merge", "Src\Merge.vs2015.vcxproj", "{9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}"
-       ProjectSection(ProjectDependencies) = postProject
-               {8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176}
-               {9E211743-85FE-4977-82F3-4F04B40C912D} = {9E211743-85FE-4977-82F3-4F04B40C912D}
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C} = {6FF56CDB-787A-4714-A28C-919003F9FA6C}
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MergeLang", "Src\MergeLang.vs2015.vcxproj", "{4B011DDA-2279-437D-903C-8028913AF31B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Foundation", "Externals\poco\Foundation\Foundation.vs2015.vcxproj", "{8164D41D-B053-405B-826C-CF37AC0EF176}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XML", "Externals\poco\XML\XML.vs2015.vcxproj", "{9E211743-85FE-4977-82F3-4F04B40C912D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Util", "Externals\poco\Util\Util.vs2015.vcxproj", "{6FF56CDB-787A-4714-A28C-919003F9FA6C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests", "Testing\GoogleTest\UnitTests\UnitTests.vs2015.vcxproj", "{733E7C0B-AC3D-47AC-A8DA-E13644D6294D}"
-       ProjectSection(ProjectDependencies) = postProject
-               {8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176}
-               {9E211743-85FE-4977-82F3-4F04B40C912D} = {9E211743-85FE-4977-82F3-4F04B40C912D}
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C} = {6FF56CDB-787A-4714-A28C-919003F9FA6C}
-       EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Poco", "Poco", "{220B870C-D051-463E-997B-8C392081EE15}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Batch Files", "Batch Files", "{DC3B258E-444F-460D-8FD9-09A8165212FA}"
-       ProjectSection(SolutionItems) = preProject
-               BuildAll.vs2015.cmd = BuildAll.vs2015.cmd
-               BuildAll2.cmd = BuildAll2.cmd
-               BuildArc.cmd = BuildArc.cmd
-               BuildBin.cmd = BuildBin.cmd
-               BuildBin.vs2015.cmd = BuildBin.vs2015.cmd
-               BuildInstaller.cmd = BuildInstaller.cmd
-               BuildManual.cmd = BuildManual.cmd
-               SetVersion.cmd = SetVersion.cmd
-               UploadToGithub.cmd = UploadToGithub.cmd
-               UploadToVirusTotal.cmd = UploadToVirusTotal.cmd
-       EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VBS Scripts", "VBS Scripts", "{8B625EC8-5063-4336-84F9-AA7FD5348525}"
-       ProjectSection(SolutionItems) = preProject
-               ExpandEnvironmenStrings.vbs = ExpandEnvironmenStrings.vbs
-       EndProjectSection
-EndProject
-Global
-       GlobalSection(SolutionConfigurationPlatforms) = preSolution
-               Debug Unicode|Win32 = Debug Unicode|Win32
-               Debug Unicode|x64 = Debug Unicode|x64
-               Release Unicode|Win32 = Release Unicode|Win32
-               Release Unicode|x64 = Release Unicode|x64
-       EndGlobalSection
-       GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug Unicode|Win32.ActiveCfg = UnicodeDebug|Win32
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug Unicode|Win32.Build.0 = UnicodeDebug|Win32
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug Unicode|x64.ActiveCfg = UnicodeDebug|x64
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug Unicode|x64.Build.0 = UnicodeDebug|x64
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release Unicode|Win32.ActiveCfg = UnicodeRelease|Win32
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release Unicode|Win32.Build.0 = UnicodeRelease|Win32
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release Unicode|x64.ActiveCfg = UnicodeRelease|x64
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release Unicode|x64.Build.0 = UnicodeRelease|x64
-               {4B011DDA-2279-437D-903C-8028913AF31B}.Debug Unicode|Win32.ActiveCfg = UnicodeDebug|Win32
-               {4B011DDA-2279-437D-903C-8028913AF31B}.Debug Unicode|Win32.Build.0 = UnicodeDebug|Win32
-               {4B011DDA-2279-437D-903C-8028913AF31B}.Debug Unicode|x64.ActiveCfg = UnicodeDebug|x64
-               {4B011DDA-2279-437D-903C-8028913AF31B}.Debug Unicode|x64.Build.0 = UnicodeDebug|x64
-               {4B011DDA-2279-437D-903C-8028913AF31B}.Release Unicode|Win32.ActiveCfg = UnicodeRelease|Win32
-               {4B011DDA-2279-437D-903C-8028913AF31B}.Release Unicode|Win32.Build.0 = UnicodeRelease|Win32
-               {4B011DDA-2279-437D-903C-8028913AF31B}.Release Unicode|x64.ActiveCfg = UnicodeRelease|x64
-               {4B011DDA-2279-437D-903C-8028913AF31B}.Release Unicode|x64.Build.0 = UnicodeRelease|x64
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.Debug Unicode|Win32.ActiveCfg = UnicodeDebug|Win32
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.Debug Unicode|Win32.Build.0 = UnicodeDebug|Win32
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.Debug Unicode|x64.ActiveCfg = UnicodeDebug|x64
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.Debug Unicode|x64.Build.0 = UnicodeDebug|x64
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.Release Unicode|Win32.ActiveCfg = UnicodeRelease|Win32
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.Release Unicode|Win32.Build.0 = UnicodeRelease|Win32
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.Release Unicode|x64.ActiveCfg = UnicodeRelease|x64
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.Release Unicode|x64.Build.0 = UnicodeRelease|x64
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.Debug Unicode|Win32.ActiveCfg = UnicodeDebug|Win32
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.Debug Unicode|Win32.Build.0 = UnicodeDebug|Win32
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.Debug Unicode|x64.ActiveCfg = UnicodeDebug|x64
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.Debug Unicode|x64.Build.0 = UnicodeDebug|x64
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.Release Unicode|Win32.ActiveCfg = UnicodeRelease|Win32
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.Release Unicode|Win32.Build.0 = UnicodeRelease|Win32
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.Release Unicode|x64.ActiveCfg = UnicodeRelease|x64
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.Release Unicode|x64.Build.0 = UnicodeRelease|x64
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Debug Unicode|Win32.ActiveCfg = UnicodeDebug|Win32
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Debug Unicode|Win32.Build.0 = UnicodeDebug|Win32
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Debug Unicode|x64.ActiveCfg = UnicodeDebug|x64
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Debug Unicode|x64.Build.0 = UnicodeDebug|x64
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Release Unicode|Win32.ActiveCfg = UnicodeRelease|Win32
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Release Unicode|Win32.Build.0 = UnicodeRelease|Win32
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Release Unicode|x64.ActiveCfg = UnicodeRelease|x64
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Release Unicode|x64.Build.0 = UnicodeRelease|x64
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Debug Unicode|Win32.Build.0 = Debug|Win32
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Debug Unicode|x64.ActiveCfg = Debug|x64
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Debug Unicode|x64.Build.0 = Debug|x64
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Release Unicode|Win32.ActiveCfg = Release|Win32
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Release Unicode|Win32.Build.0 = Release|Win32
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Release Unicode|x64.ActiveCfg = Release|x64
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Release Unicode|x64.Build.0 = Release|x64
-       EndGlobalSection
-       GlobalSection(SolutionProperties) = preSolution
-               HideSolutionNode = FALSE
-       EndGlobalSection
-       GlobalSection(NestedProjects) = preSolution
-               {8164D41D-B053-405B-826C-CF37AC0EF176} = {220B870C-D051-463E-997B-8C392081EE15}
-               {9E211743-85FE-4977-82F3-4F04B40C912D} = {220B870C-D051-463E-997B-8C392081EE15}
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C} = {220B870C-D051-463E-997B-8C392081EE15}
-               {8B625EC8-5063-4336-84F9-AA7FD5348525} = {DC3B258E-444F-460D-8FD9-09A8165212FA}
-       EndGlobalSection
-EndGlobal
+Microsoft Visual Studio Solution File, Format Version 12.00\r
+# Visual Studio 14\r
+VisualStudioVersion = 14.0.25420.1\r
+MinimumVisualStudioVersion = 10.0.40219.1\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Merge", "Src\Merge.vs2015.vcxproj", "{9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176}\r
+               {9E211743-85FE-4977-82F3-4F04B40C912D} = {9E211743-85FE-4977-82F3-4F04B40C912D}\r
+               {6FF56CDB-787A-4714-A28C-919003F9FA6C} = {6FF56CDB-787A-4714-A28C-919003F9FA6C}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MergeLang", "Src\MergeLang.vs2015.vcxproj", "{4B011DDA-2279-437D-903C-8028913AF31B}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Foundation", "Externals\poco\Foundation\Foundation.vs2015.vcxproj", "{8164D41D-B053-405B-826C-CF37AC0EF176}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XML", "Externals\poco\XML\XML.vs2015.vcxproj", "{9E211743-85FE-4977-82F3-4F04B40C912D}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Util", "Externals\poco\Util\Util.vs2015.vcxproj", "{6FF56CDB-787A-4714-A28C-919003F9FA6C}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests", "Testing\GoogleTest\UnitTests\UnitTests.vs2015.vcxproj", "{733E7C0B-AC3D-47AC-A8DA-E13644D6294D}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176}\r
+               {9E211743-85FE-4977-82F3-4F04B40C912D} = {9E211743-85FE-4977-82F3-4F04B40C912D}\r
+               {6FF56CDB-787A-4714-A28C-919003F9FA6C} = {6FF56CDB-787A-4714-A28C-919003F9FA6C}\r
+       EndProjectSection\r
+EndProject\r
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Poco", "Poco", "{220B870C-D051-463E-997B-8C392081EE15}"\r
+EndProject\r
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Batch Files", "Batch Files", "{DC3B258E-444F-460D-8FD9-09A8165212FA}"\r
+       ProjectSection(SolutionItems) = preProject\r
+               BuildAll.vs2015.cmd = BuildAll.vs2015.cmd\r
+               BuildAll.vs2017.cmd = BuildAll.vs2017.cmd\r
+               BuildArc.cmd = BuildArc.cmd\r
+               BuildBin.vs2015.cmd = BuildBin.vs2015.cmd\r
+               BuildBin.vs2017.cmd = BuildBin.vs2017.cmd\r
+               BuildInstaller.cmd = BuildInstaller.cmd\r
+               BuildManual.cmd = BuildManual.cmd\r
+               SetVersion.cmd = SetVersion.cmd\r
+               UploadToGithub.cmd = UploadToGithub.cmd\r
+               UploadToVirusTotal.cmd = UploadToVirusTotal.cmd\r
+       EndProjectSection\r
+EndProject\r
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VBS Scripts", "VBS Scripts", "{8B625EC8-5063-4336-84F9-AA7FD5348525}"\r
+       ProjectSection(SolutionItems) = preProject\r
+               ExpandEnvironmenStrings.vbs = ExpandEnvironmenStrings.vbs\r
+       EndProjectSection\r
+EndProject\r
+Global\r
+       GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
+               Debug Unicode|Win32 = Debug Unicode|Win32\r
+               Debug Unicode|x64 = Debug Unicode|x64\r
+               Release Unicode|Win32 = Release Unicode|Win32\r
+               Release Unicode|x64 = Release Unicode|x64\r
+       EndGlobalSection\r
+       GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
+               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug Unicode|Win32.ActiveCfg = UnicodeDebug|Win32\r
+               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug Unicode|Win32.Build.0 = UnicodeDebug|Win32\r
+               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug Unicode|x64.ActiveCfg = UnicodeDebug|x64\r
+               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug Unicode|x64.Build.0 = UnicodeDebug|x64\r
+               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release Unicode|Win32.ActiveCfg = UnicodeRelease|Win32\r
+               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release Unicode|Win32.Build.0 = UnicodeRelease|Win32\r
+               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release Unicode|x64.ActiveCfg = UnicodeRelease|x64\r
+               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release Unicode|x64.Build.0 = UnicodeRelease|x64\r
+               {4B011DDA-2279-437D-903C-8028913AF31B}.Debug Unicode|Win32.ActiveCfg = UnicodeDebug|Win32\r
+               {4B011DDA-2279-437D-903C-8028913AF31B}.Debug Unicode|Win32.Build.0 = UnicodeDebug|Win32\r
+               {4B011DDA-2279-437D-903C-8028913AF31B}.Debug Unicode|x64.ActiveCfg = UnicodeDebug|x64\r
+               {4B011DDA-2279-437D-903C-8028913AF31B}.Debug Unicode|x64.Build.0 = UnicodeDebug|x64\r
+               {4B011DDA-2279-437D-903C-8028913AF31B}.Release Unicode|Win32.ActiveCfg = UnicodeRelease|Win32\r
+               {4B011DDA-2279-437D-903C-8028913AF31B}.Release Unicode|Win32.Build.0 = UnicodeRelease|Win32\r
+               {4B011DDA-2279-437D-903C-8028913AF31B}.Release Unicode|x64.ActiveCfg = UnicodeRelease|x64\r
+               {4B011DDA-2279-437D-903C-8028913AF31B}.Release Unicode|x64.Build.0 = UnicodeRelease|x64\r
+               {8164D41D-B053-405B-826C-CF37AC0EF176}.Debug Unicode|Win32.ActiveCfg = UnicodeDebug|Win32\r
+               {8164D41D-B053-405B-826C-CF37AC0EF176}.Debug Unicode|Win32.Build.0 = UnicodeDebug|Win32\r
+               {8164D41D-B053-405B-826C-CF37AC0EF176}.Debug Unicode|x64.ActiveCfg = UnicodeDebug|x64\r
+               {8164D41D-B053-405B-826C-CF37AC0EF176}.Debug Unicode|x64.Build.0 = UnicodeDebug|x64\r
+               {8164D41D-B053-405B-826C-CF37AC0EF176}.Release Unicode|Win32.ActiveCfg = UnicodeRelease|Win32\r
+               {8164D41D-B053-405B-826C-CF37AC0EF176}.Release Unicode|Win32.Build.0 = UnicodeRelease|Win32\r
+               {8164D41D-B053-405B-826C-CF37AC0EF176}.Release Unicode|x64.ActiveCfg = UnicodeRelease|x64\r
+               {8164D41D-B053-405B-826C-CF37AC0EF176}.Release Unicode|x64.Build.0 = UnicodeRelease|x64\r
+               {9E211743-85FE-4977-82F3-4F04B40C912D}.Debug Unicode|Win32.ActiveCfg = UnicodeDebug|Win32\r
+               {9E211743-85FE-4977-82F3-4F04B40C912D}.Debug Unicode|Win32.Build.0 = UnicodeDebug|Win32\r
+               {9E211743-85FE-4977-82F3-4F04B40C912D}.Debug Unicode|x64.ActiveCfg = UnicodeDebug|x64\r
+               {9E211743-85FE-4977-82F3-4F04B40C912D}.Debug Unicode|x64.Build.0 = UnicodeDebug|x64\r
+               {9E211743-85FE-4977-82F3-4F04B40C912D}.Release Unicode|Win32.ActiveCfg = UnicodeRelease|Win32\r
+               {9E211743-85FE-4977-82F3-4F04B40C912D}.Release Unicode|Win32.Build.0 = UnicodeRelease|Win32\r
+               {9E211743-85FE-4977-82F3-4F04B40C912D}.Release Unicode|x64.ActiveCfg = UnicodeRelease|x64\r
+               {9E211743-85FE-4977-82F3-4F04B40C912D}.Release Unicode|x64.Build.0 = UnicodeRelease|x64\r
+               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Debug Unicode|Win32.ActiveCfg = UnicodeDebug|Win32\r
+               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Debug Unicode|Win32.Build.0 = UnicodeDebug|Win32\r
+               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Debug Unicode|x64.ActiveCfg = UnicodeDebug|x64\r
+               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Debug Unicode|x64.Build.0 = UnicodeDebug|x64\r
+               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Release Unicode|Win32.ActiveCfg = UnicodeRelease|Win32\r
+               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Release Unicode|Win32.Build.0 = UnicodeRelease|Win32\r
+               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Release Unicode|x64.ActiveCfg = UnicodeRelease|x64\r
+               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Release Unicode|x64.Build.0 = UnicodeRelease|x64\r
+               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Debug Unicode|Win32.ActiveCfg = Debug|Win32\r
+               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Debug Unicode|Win32.Build.0 = Debug|Win32\r
+               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Debug Unicode|x64.ActiveCfg = Debug|x64\r
+               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Debug Unicode|x64.Build.0 = Debug|x64\r
+               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Release Unicode|Win32.ActiveCfg = Release|Win32\r
+               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Release Unicode|Win32.Build.0 = Release|Win32\r
+               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Release Unicode|x64.ActiveCfg = Release|x64\r
+               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Release Unicode|x64.Build.0 = Release|x64\r
+       EndGlobalSection\r
+       GlobalSection(SolutionProperties) = preSolution\r
+               HideSolutionNode = FALSE\r
+       EndGlobalSection\r
+       GlobalSection(NestedProjects) = preSolution\r
+               {8164D41D-B053-405B-826C-CF37AC0EF176} = {220B870C-D051-463E-997B-8C392081EE15}\r
+               {9E211743-85FE-4977-82F3-4F04B40C912D} = {220B870C-D051-463E-997B-8C392081EE15}\r
+               {6FF56CDB-787A-4714-A28C-919003F9FA6C} = {220B870C-D051-463E-997B-8C392081EE15}\r
+               {8B625EC8-5063-4336-84F9-AA7FD5348525} = {DC3B258E-444F-460D-8FD9-09A8165212FA}\r
+       EndGlobalSection\r
+EndGlobal\r
diff --git a/WinMerge.vs2017.sln b/WinMerge.vs2017.sln
index b543e7b..1c1f603 100644 (file)
--- a/WinMerge.vs2017.sln
+++ b/WinMerge.vs2017.sln
@@ -1,117 +1,114 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26430.16
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Merge", "Src\Merge.vs2017.vcxproj", "{9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}"
-       ProjectSection(ProjectDependencies) = postProject
-               {8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176}
-               {9E211743-85FE-4977-82F3-4F04B40C912D} = {9E211743-85FE-4977-82F3-4F04B40C912D}
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C} = {6FF56CDB-787A-4714-A28C-919003F9FA6C}
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MergeLang", "Src\MergeLang.vs2017.vcxproj", "{4B011DDA-2279-437D-903C-8028913AF31B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Foundation", "Externals\poco\Foundation\Foundation.vs2017.vcxproj", "{8164D41D-B053-405B-826C-CF37AC0EF176}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XML", "Externals\poco\XML\XML.vs2017.vcxproj", "{9E211743-85FE-4977-82F3-4F04B40C912D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Util", "Externals\poco\Util\Util.vs2017.vcxproj", "{6FF56CDB-787A-4714-A28C-919003F9FA6C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests", "Testing\GoogleTest\UnitTests\UnitTests.vs2017.vcxproj", "{733E7C0B-AC3D-47AC-A8DA-E13644D6294D}"
-       ProjectSection(ProjectDependencies) = postProject
-               {8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176}
-               {9E211743-85FE-4977-82F3-4F04B40C912D} = {9E211743-85FE-4977-82F3-4F04B40C912D}
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C} = {6FF56CDB-787A-4714-A28C-919003F9FA6C}
-       EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Poco", "Poco", "{220B870C-D051-463E-997B-8C392081EE15}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Batch Files", "Batch Files", "{DC3B258E-444F-460D-8FD9-09A8165212FA}"
-       ProjectSection(SolutionItems) = preProject
-               BuildAll.vs2015.cmd = BuildAll.vs2015.cmd
-               BuildAll.vs2017.cmd = BuildAll.vs2017.cmd
-               BuildAll2.cmd = BuildAll2.cmd
-               BuildArc.cmd = BuildArc.cmd
-               BuildBin.cmd = BuildBin.cmd
-               BuildBin.vs2015.cmd = BuildBin.vs2015.cmd
-               BuildBin.vs2017.cmd = BuildBin.vs2017.cmd
-               BuildInstaller.cmd = BuildInstaller.cmd
-               BuildManual.cmd = BuildManual.cmd
-               SetVersion.cmd = SetVersion.cmd
-               UploadToGithub.cmd = UploadToGithub.cmd
-               UploadToVirusTotal.cmd = UploadToVirusTotal.cmd
-       EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VBS Scripts", "VBS Scripts", "{8B625EC8-5063-4336-84F9-AA7FD5348525}"
-       ProjectSection(SolutionItems) = preProject
-               ExpandEnvironmenStrings.vbs = ExpandEnvironmenStrings.vbs
-       EndProjectSection
-EndProject
-Global
-       GlobalSection(SolutionConfigurationPlatforms) = preSolution
-               Debug Unicode|Win32 = Debug Unicode|Win32
-               Debug Unicode|x64 = Debug Unicode|x64
-               Release Unicode|Win32 = Release Unicode|Win32
-               Release Unicode|x64 = Release Unicode|x64
-       EndGlobalSection
-       GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug Unicode|Win32.ActiveCfg = UnicodeDebug|Win32
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug Unicode|Win32.Build.0 = UnicodeDebug|Win32
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug Unicode|x64.ActiveCfg = UnicodeDebug|x64
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug Unicode|x64.Build.0 = UnicodeDebug|x64
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release Unicode|Win32.ActiveCfg = UnicodeRelease|Win32
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release Unicode|Win32.Build.0 = UnicodeRelease|Win32
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release Unicode|x64.ActiveCfg = UnicodeRelease|x64
-               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release Unicode|x64.Build.0 = UnicodeRelease|x64
-               {4B011DDA-2279-437D-903C-8028913AF31B}.Debug Unicode|Win32.ActiveCfg = UnicodeDebug|Win32
-               {4B011DDA-2279-437D-903C-8028913AF31B}.Debug Unicode|Win32.Build.0 = UnicodeDebug|Win32
-               {4B011DDA-2279-437D-903C-8028913AF31B}.Debug Unicode|x64.ActiveCfg = UnicodeDebug|x64
-               {4B011DDA-2279-437D-903C-8028913AF31B}.Debug Unicode|x64.Build.0 = UnicodeDebug|x64
-               {4B011DDA-2279-437D-903C-8028913AF31B}.Release Unicode|Win32.ActiveCfg = UnicodeRelease|Win32
-               {4B011DDA-2279-437D-903C-8028913AF31B}.Release Unicode|Win32.Build.0 = UnicodeRelease|Win32
-               {4B011DDA-2279-437D-903C-8028913AF31B}.Release Unicode|x64.ActiveCfg = UnicodeRelease|x64
-               {4B011DDA-2279-437D-903C-8028913AF31B}.Release Unicode|x64.Build.0 = UnicodeRelease|x64
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.Debug Unicode|Win32.ActiveCfg = UnicodeDebug|Win32
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.Debug Unicode|Win32.Build.0 = UnicodeDebug|Win32
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.Debug Unicode|x64.ActiveCfg = UnicodeDebug|x64
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.Debug Unicode|x64.Build.0 = UnicodeDebug|x64
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.Release Unicode|Win32.ActiveCfg = UnicodeRelease|Win32
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.Release Unicode|Win32.Build.0 = UnicodeRelease|Win32
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.Release Unicode|x64.ActiveCfg = UnicodeRelease|x64
-               {8164D41D-B053-405B-826C-CF37AC0EF176}.Release Unicode|x64.Build.0 = UnicodeRelease|x64
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.Debug Unicode|Win32.ActiveCfg = UnicodeDebug|Win32
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.Debug Unicode|Win32.Build.0 = UnicodeDebug|Win32
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.Debug Unicode|x64.ActiveCfg = UnicodeDebug|x64
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.Debug Unicode|x64.Build.0 = UnicodeDebug|x64
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.Release Unicode|Win32.ActiveCfg = UnicodeRelease|Win32
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.Release Unicode|Win32.Build.0 = UnicodeRelease|Win32
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.Release Unicode|x64.ActiveCfg = UnicodeRelease|x64
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.Release Unicode|x64.Build.0 = UnicodeRelease|x64
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Debug Unicode|Win32.ActiveCfg = UnicodeDebug|Win32
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Debug Unicode|Win32.Build.0 = UnicodeDebug|Win32
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Debug Unicode|x64.ActiveCfg = UnicodeDebug|x64
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Debug Unicode|x64.Build.0 = UnicodeDebug|x64
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Release Unicode|Win32.ActiveCfg = UnicodeRelease|Win32
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Release Unicode|Win32.Build.0 = UnicodeRelease|Win32
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Release Unicode|x64.ActiveCfg = UnicodeRelease|x64
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Release Unicode|x64.Build.0 = UnicodeRelease|x64
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Debug Unicode|Win32.Build.0 = Debug|Win32
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Debug Unicode|x64.ActiveCfg = Debug|x64
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Debug Unicode|x64.Build.0 = Debug|x64
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Release Unicode|Win32.ActiveCfg = Release|Win32
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Release Unicode|Win32.Build.0 = Release|Win32
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Release Unicode|x64.ActiveCfg = Release|x64
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Release Unicode|x64.Build.0 = Release|x64
-       EndGlobalSection
-       GlobalSection(SolutionProperties) = preSolution
-               HideSolutionNode = FALSE
-       EndGlobalSection
-       GlobalSection(NestedProjects) = preSolution
-               {8164D41D-B053-405B-826C-CF37AC0EF176} = {220B870C-D051-463E-997B-8C392081EE15}
-               {9E211743-85FE-4977-82F3-4F04B40C912D} = {220B870C-D051-463E-997B-8C392081EE15}
-               {6FF56CDB-787A-4714-A28C-919003F9FA6C} = {220B870C-D051-463E-997B-8C392081EE15}
-               {8B625EC8-5063-4336-84F9-AA7FD5348525} = {DC3B258E-444F-460D-8FD9-09A8165212FA}
-       EndGlobalSection
-EndGlobal
+Microsoft Visual Studio Solution File, Format Version 12.00\r
+# Visual Studio 15\r
+VisualStudioVersion = 15.0.26430.16\r
+MinimumVisualStudioVersion = 10.0.40219.1\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Merge", "Src\Merge.vs2017.vcxproj", "{9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176}\r
+               {9E211743-85FE-4977-82F3-4F04B40C912D} = {9E211743-85FE-4977-82F3-4F04B40C912D}\r
+               {6FF56CDB-787A-4714-A28C-919003F9FA6C} = {6FF56CDB-787A-4714-A28C-919003F9FA6C}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MergeLang", "Src\MergeLang.vs2017.vcxproj", "{4B011DDA-2279-437D-903C-8028913AF31B}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Foundation", "Externals\poco\Foundation\Foundation.vs2017.vcxproj", "{8164D41D-B053-405B-826C-CF37AC0EF176}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XML", "Externals\poco\XML\XML.vs2017.vcxproj", "{9E211743-85FE-4977-82F3-4F04B40C912D}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Util", "Externals\poco\Util\Util.vs2017.vcxproj", "{6FF56CDB-787A-4714-A28C-919003F9FA6C}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests", "Testing\GoogleTest\UnitTests\UnitTests.vs2017.vcxproj", "{733E7C0B-AC3D-47AC-A8DA-E13644D6294D}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176}\r
+               {9E211743-85FE-4977-82F3-4F04B40C912D} = {9E211743-85FE-4977-82F3-4F04B40C912D}\r
+               {6FF56CDB-787A-4714-A28C-919003F9FA6C} = {6FF56CDB-787A-4714-A28C-919003F9FA6C}\r
+       EndProjectSection\r
+EndProject\r
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Poco", "Poco", "{220B870C-D051-463E-997B-8C392081EE15}"\r
+EndProject\r
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Batch Files", "Batch Files", "{DC3B258E-444F-460D-8FD9-09A8165212FA}"\r
+       ProjectSection(SolutionItems) = preProject\r
+               BuildAll.vs2015.cmd = BuildAll.vs2015.cmd\r
+               BuildAll.vs2017.cmd = BuildAll.vs2017.cmd\r
+               BuildArc.cmd = BuildArc.cmd\r
+               BuildBin.vs2015.cmd = BuildBin.vs2015.cmd\r
+               BuildBin.vs2017.cmd = BuildBin.vs2017.cmd\r
+               BuildInstaller.cmd = BuildInstaller.cmd\r
+               BuildManual.cmd = BuildManual.cmd\r
+               SetVersion.cmd = SetVersion.cmd\r
+               UploadToGithub.cmd = UploadToGithub.cmd\r
+               UploadToVirusTotal.cmd = UploadToVirusTotal.cmd\r
+       EndProjectSection\r
+EndProject\r
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VBS Scripts", "VBS Scripts", "{8B625EC8-5063-4336-84F9-AA7FD5348525}"\r
+       ProjectSection(SolutionItems) = preProject\r
+               ExpandEnvironmenStrings.vbs = ExpandEnvironmenStrings.vbs\r
+       EndProjectSection\r
+EndProject\r
+Global\r
+       GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
+               Debug Unicode|Win32 = Debug Unicode|Win32\r
+               Debug Unicode|x64 = Debug Unicode|x64\r
+               Release Unicode|Win32 = Release Unicode|Win32\r
+               Release Unicode|x64 = Release Unicode|x64\r
+       EndGlobalSection\r
+       GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
+               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug Unicode|Win32.ActiveCfg = UnicodeDebug|Win32\r
+               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug Unicode|Win32.Build.0 = UnicodeDebug|Win32\r
+               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug Unicode|x64.ActiveCfg = UnicodeDebug|x64\r
+               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug Unicode|x64.Build.0 = UnicodeDebug|x64\r
+               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release Unicode|Win32.ActiveCfg = UnicodeRelease|Win32\r
+               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release Unicode|Win32.Build.0 = UnicodeRelease|Win32\r
+               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release Unicode|x64.ActiveCfg = UnicodeRelease|x64\r
+               {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release Unicode|x64.Build.0 = UnicodeRelease|x64\r
+               {4B011DDA-2279-437D-903C-8028913AF31B}.Debug Unicode|Win32.ActiveCfg = UnicodeDebug|Win32\r
+               {4B011DDA-2279-437D-903C-8028913AF31B}.Debug Unicode|Win32.Build.0 = UnicodeDebug|Win32\r
+               {4B011DDA-2279-437D-903C-8028913AF31B}.Debug Unicode|x64.ActiveCfg = UnicodeDebug|x64\r
+               {4B011DDA-2279-437D-903C-8028913AF31B}.Debug Unicode|x64.Build.0 = UnicodeDebug|x64\r
+               {4B011DDA-2279-437D-903C-8028913AF31B}.Release Unicode|Win32.ActiveCfg = UnicodeRelease|Win32\r
+               {4B011DDA-2279-437D-903C-8028913AF31B}.Release Unicode|Win32.Build.0 = UnicodeRelease|Win32\r
+               {4B011DDA-2279-437D-903C-8028913AF31B}.Release Unicode|x64.ActiveCfg = UnicodeRelease|x64\r
+               {4B011DDA-2279-437D-903C-8028913AF31B}.Release Unicode|x64.Build.0 = UnicodeRelease|x64\r
+               {8164D41D-B053-405B-826C-CF37AC0EF176}.Debug Unicode|Win32.ActiveCfg = UnicodeDebug|Win32\r
+               {8164D41D-B053-405B-826C-CF37AC0EF176}.Debug Unicode|Win32.Build.0 = UnicodeDebug|Win32\r
+               {8164D41D-B053-405B-826C-CF37AC0EF176}.Debug Unicode|x64.ActiveCfg = UnicodeDebug|x64\r
+               {8164D41D-B053-405B-826C-CF37AC0EF176}.Debug Unicode|x64.Build.0 = UnicodeDebug|x64\r
+               {8164D41D-B053-405B-826C-CF37AC0EF176}.Release Unicode|Win32.ActiveCfg = UnicodeRelease|Win32\r
+               {8164D41D-B053-405B-826C-CF37AC0EF176}.Release Unicode|Win32.Build.0 = UnicodeRelease|Win32\r
+               {8164D41D-B053-405B-826C-CF37AC0EF176}.Release Unicode|x64.ActiveCfg = UnicodeRelease|x64\r
+               {8164D41D-B053-405B-826C-CF37AC0EF176}.Release Unicode|x64.Build.0 = UnicodeRelease|x64\r
+               {9E211743-85FE-4977-82F3-4F04B40C912D}.Debug Unicode|Win32.ActiveCfg = UnicodeDebug|Win32\r
+               {9E211743-85FE-4977-82F3-4F04B40C912D}.Debug Unicode|Win32.Build.0 = UnicodeDebug|Win32\r
+               {9E211743-85FE-4977-82F3-4F04B40C912D}.Debug Unicode|x64.ActiveCfg = UnicodeDebug|x64\r
+               {9E211743-85FE-4977-82F3-4F04B40C912D}.Debug Unicode|x64.Build.0 = UnicodeDebug|x64\r
+               {9E211743-85FE-4977-82F3-4F04B40C912D}.Release Unicode|Win32.ActiveCfg = UnicodeRelease|Win32\r
+               {9E211743-85FE-4977-82F3-4F04B40C912D}.Release Unicode|Win32.Build.0 = UnicodeRelease|Win32\r
+               {9E211743-85FE-4977-82F3-4F04B40C912D}.Release Unicode|x64.ActiveCfg = UnicodeRelease|x64\r
+               {9E211743-85FE-4977-82F3-4F04B40C912D}.Release Unicode|x64.Build.0 = UnicodeRelease|x64\r
+               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Debug Unicode|Win32.ActiveCfg = UnicodeDebug|Win32\r
+               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Debug Unicode|Win32.Build.0 = UnicodeDebug|Win32\r
+               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Debug Unicode|x64.ActiveCfg = UnicodeDebug|x64\r
+               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Debug Unicode|x64.Build.0 = UnicodeDebug|x64\r
+               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Release Unicode|Win32.ActiveCfg = UnicodeRelease|Win32\r
+               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Release Unicode|Win32.Build.0 = UnicodeRelease|Win32\r
+               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Release Unicode|x64.ActiveCfg = UnicodeRelease|x64\r
+               {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Release Unicode|x64.Build.0 = UnicodeRelease|x64\r
+               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Debug Unicode|Win32.ActiveCfg = Debug|Win32\r
+               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Debug Unicode|Win32.Build.0 = Debug|Win32\r
+               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Debug Unicode|x64.ActiveCfg = Debug|x64\r
+               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Debug Unicode|x64.Build.0 = Debug|x64\r
+               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Release Unicode|Win32.ActiveCfg = Release|Win32\r
+               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Release Unicode|Win32.Build.0 = Release|Win32\r
+               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Release Unicode|x64.ActiveCfg = Release|x64\r
+               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Release Unicode|x64.Build.0 = Release|x64\r
+       EndGlobalSection\r
+       GlobalSection(SolutionProperties) = preSolution\r
+               HideSolutionNode = FALSE\r
+       EndGlobalSection\r
+       GlobalSection(NestedProjects) = preSolution\r
+               {8164D41D-B053-405B-826C-CF37AC0EF176} = {220B870C-D051-463E-997B-8C392081EE15}\r
+               {9E211743-85FE-4977-82F3-4F04B40C912D} = {220B870C-D051-463E-997B-8C392081EE15}\r
+               {6FF56CDB-787A-4714-A28C-919003F9FA6C} = {220B870C-D051-463E-997B-8C392081EE15}\r
+               {8B625EC8-5063-4336-84F9-AA7FD5348525} = {DC3B258E-444F-460D-8FD9-09A8165212FA}\r
+       EndGlobalSection\r
+EndGlobal\r
About OSDN
Find Software
Develop Software
Help