Add editlib.vcxitems

diff --git a/ALL.vs2017.sln b/ALL.vs2017.sln
index faf53b8..b52931c 100644 (file)
--- a/ALL.vs2017.sln
+++ b/ALL.vs2017.sln
@@ -552,7 +552,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Logos", "Logos", "{91ED0FD4
                Docs\Logos\WinMerge_logo_trans.tif = Docs\Logos\WinMerge_logo_trans.tif
        EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editlib", "Externals\crystaledit\editlib\editlib.vcxitems", "{7515AC3C-389A-44CD-B940-A59DDE5B8AE3}"
+EndProject
 Global
+       GlobalSection(SharedMSBuildProjectFiles) = preSolution
+               Externals\crystaledit\editlib\editlib.vcxitems*{9fda4af0-ccfd-4812-bdb9-53efedb32bde}*SharedItemsImports = 4
+               Externals\crystaledit\editlib\editlib.vcxitems*{c347d6ae-7a2b-4ed0-97ad-2595e1c5d7dd}*SharedItemsImports = 4
+       EndGlobalSection
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
                Debug|x64 = Debug|x64
@@ -1032,6 +1038,7 @@ Global
                {A348FF0E-3DD2-4F8B-BF10-B4092A0B8FDB} = {860FEA9B-C932-4878-9E76-3DE0241591C2}
                {88571237-56AD-421A-8F88-26983BDD8D6C} = {4407E7D0-41F5-4FC4-ADB9-948C09966721}
                {91ED0FD4-86C9-4D7C-87C1-1B12F04DCAD0} = {860FEA9B-C932-4878-9E76-3DE0241591C2}
+               {7515AC3C-389A-44CD-B940-A59DDE5B8AE3} = {6BBF0DEA-C0B8-4B73-B540-3BF8297B49B4}
        EndGlobalSection
        GlobalSection(ExtensibilityGlobals) = postSolution
                SolutionGuid = {CC2E4F75-FADC-4F44-BD62-47A321828081}

diff --git a/ALL.vs2019.sln b/ALL.vs2019.sln
index 12fa157..1595b93 100644 (file)
--- a/ALL.vs2019.sln
+++ b/ALL.vs2019.sln
@@ -552,7 +552,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Logos", "Logos", "{91ED0FD4
                Docs\Logos\WinMerge_logo_trans.tif = Docs\Logos\WinMerge_logo_trans.tif
        EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editlib", "Externals\crystaledit\editlib\editlib.vcxitems", "{7515AC3C-389A-44CD-B940-A59DDE5B8AE3}"
+EndProject
 Global
+       GlobalSection(SharedMSBuildProjectFiles) = preSolution
+               Externals\crystaledit\editlib\editlib.vcxitems*{9fda4af0-ccfd-4812-bdb9-53efedb32bde}*SharedItemsImports = 4
+               Externals\crystaledit\editlib\editlib.vcxitems*{c347d6ae-7a2b-4ed0-97ad-2595e1c5d7dd}*SharedItemsImports = 4
+       EndGlobalSection
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
                Debug|x64 = Debug|x64
@@ -1032,6 +1038,7 @@ Global
                {A348FF0E-3DD2-4F8B-BF10-B4092A0B8FDB} = {860FEA9B-C932-4878-9E76-3DE0241591C2}
                {88571237-56AD-421A-8F88-26983BDD8D6C} = {4407E7D0-41F5-4FC4-ADB9-948C09966721}
                {91ED0FD4-86C9-4D7C-87C1-1B12F04DCAD0} = {860FEA9B-C932-4878-9E76-3DE0241591C2}
+               {7515AC3C-389A-44CD-B940-A59DDE5B8AE3} = {6BBF0DEA-C0B8-4B73-B540-3BF8297B49B4}
        EndGlobalSection
        GlobalSection(ExtensibilityGlobals) = postSolution
                SolutionGuid = {CC2E4F75-FADC-4F44-BD62-47A321828081}

diff --git a/Externals/crystaledit/Sample/SampleStatic.vcxproj b/Externals/crystaledit/Sample/SampleStatic.vcxproj
index 94c74c9..eee5d21 100644 (file)
--- a/Externals/crystaledit/Sample/SampleStatic.vcxproj
+++ b/Externals/crystaledit/Sample/SampleStatic.vcxproj
@@ -60,6 +60,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
+  <ImportGroup Label="Shared">
+    <Import Project="..\editlib\editlib.vcxitems" Label="Shared" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
@@ -263,82 +266,6 @@
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\editlib\parsers\asp.cpp" />
-    <ClCompile Include="..\editlib\parsers\autoit.cpp" />
-    <ClCompile Include="..\editlib\parsers\basic.cpp" />
-    <ClCompile Include="..\editlib\parsers\batch.cpp" />
-    <ClCompile Include="..\editlib\ccrystaleditview.cpp" />
-    <ClCompile Include="..\editlib\parsers\crystallineparser.cpp" />
-    <ClCompile Include="..\editlib\parsers\javascript.cpp" />
-    <ClCompile Include="..\editlib\renderers\ccrystalrendererdirectwrite.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\editlib\renderers\ccrystalrenderergdi.cpp" />
-    <ClCompile Include="..\editlib\ccrystaltextbuffer.cpp" />
-    <ClCompile Include="..\editlib\ccrystaltextmarkers.cpp" />
-    <ClCompile Include="..\editlib\ccrystaltextview.cpp" />
-    <ClCompile Include="..\editlib\ccrystaltextview2.cpp" />
-    <ClCompile Include="..\editlib\dialogs\ctextmarkerdlg.cpp" />
-    <ClCompile Include="..\editlib\dialogs\ceditreplacedlg.cpp" />
-    <ClCompile Include="..\editlib\dialogs\cfindtextdlg.cpp" />
-    <ClCompile Include="..\editlib\dialogs\chcondlg.cpp" />
-    <ClCompile Include="..\editlib\parsers\cplusplus.cpp" />
-    <ClCompile Include="..\editlib\utils\cregexp.cpp" />
-    <ClCompile Include="..\editlib\crystaleditviewex.cpp" />
-    <ClCompile Include="..\editlib\crystalparser.cpp" />
-    <ClCompile Include="..\editlib\crystaltextblock.cpp" />
-    <ClCompile Include="..\editlib\utils\cs2cs.cpp" />
-    <ClCompile Include="..\editlib\parsers\csharp.cpp" />
-    <ClCompile Include="..\editlib\parsers\css.cpp" />
-    <ClCompile Include="..\editlib\parsers\dcl.cpp" />
-    <ClCompile Include="..\editlib\edtlib.cpp" />
-    <ClCompile Include="..\editlib\utils\filesup.cpp" />
-    <ClCompile Include="..\editlib\parsers\fortran.cpp" />
-    <ClCompile Include="..\editlib\utils\fpattern.cpp" />
-    <ClCompile Include="..\editlib\parsers\go.cpp" />
-    <ClCompile Include="..\editlib\dialogs\gotodlg.cpp" />
-    <ClCompile Include="..\editlib\parsers\html.cpp" />
-    <ClCompile Include="..\editlib\parsers\isx.cpp" />
-    <ClCompile Include="..\editlib\utils\hqbitmap.cpp" />
-    <ClCompile Include="..\editlib\utils\icu.cpp" />
-    <ClCompile Include="..\editlib\parsers\ini.cpp" />
-    <ClCompile Include="..\editlib\parsers\innosetup.cpp" />
-    <ClCompile Include="..\editlib\parsers\is.cpp" />
-    <ClCompile Include="..\editlib\parsers\java.cpp" />
-    <ClCompile Include="..\editlib\LineInfo.cpp" />
-    <ClCompile Include="..\editlib\parsers\lisp.cpp" />
-    <ClCompile Include="..\editlib\parsers\lua.cpp" />
-    <ClCompile Include="..\editlib\dialogs\memcombo.cpp" />
-    <ClCompile Include="..\editlib\parsers\nsis.cpp" />
-    <ClCompile Include="..\editlib\parsers\pascal.cpp" />
-    <ClCompile Include="..\editlib\parsers\perl.cpp" />
-    <ClCompile Include="..\editlib\parsers\php.cpp" />
-    <ClCompile Include="..\editlib\parsers\plain.cpp" />
-    <ClCompile Include="..\editlib\parsers\po.cpp" />
-    <ClCompile Include="..\editlib\parsers\powershell.cpp" />
-    <ClCompile Include="..\editlib\parsers\python.cpp" />
-    <ClCompile Include="..\editlib\utils\registry.cpp" />
-    <ClCompile Include="..\editlib\parsers\rexx.cpp" />
-    <ClCompile Include="..\editlib\parsers\rsrc.cpp" />
-    <ClCompile Include="..\editlib\parsers\ruby.cpp" />
-    <ClCompile Include="..\editlib\parsers\rust.cpp" />
-    <ClCompile Include="..\editlib\parsers\sgml.cpp" />
-    <ClCompile Include="..\editlib\parsers\sh.cpp" />
-    <ClCompile Include="..\editlib\parsers\siod.cpp" />
-    <ClCompile Include="..\editlib\parsers\sql.cpp" />
-    <ClCompile Include="..\editlib\utils\string_util.cpp">
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\editlib\SyntaxColors.cpp" />
-    <ClCompile Include="..\editlib\parsers\tcl.cpp" />
-    <ClCompile Include="..\editlib\parsers\tex.cpp" />
-    <ClCompile Include="..\editlib\UndoRecord.cpp" />
-    <ClCompile Include="..\editlib\parsers\verilog.cpp" />
-    <ClCompile Include="..\editlib\parsers\vhdl.cpp" />
-    <ClCompile Include="..\editlib\ViewableWhitespace.cpp" />
-    <ClCompile Include="..\editlib\utils\wcwidth.cpp" />
-    <ClCompile Include="..\editlib\parsers\xml.cpp" />
     <ClCompile Include="ChildFrm.cpp" />
     <ClCompile Include="MainFrm.cpp" />
     <ClCompile Include="Sample.cpp" />
@@ -352,40 +279,6 @@
     <ResourceCompile Include="Sample.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\editlib\ccrystaleditview.h" />
-    <ClInclude Include="..\editlib\renderers\ccrystalrenderer.h" />
-    <ClInclude Include="..\editlib\renderers\ccrystalrendererdirectwrite.h" />
-    <ClInclude Include="..\editlib\renderers\ccrystalrenderergdi.h" />
-    <ClInclude Include="..\editlib\ccrystaltextbuffer.h" />
-    <ClInclude Include="..\editlib\ccrystaltextmarkers.h" />
-    <ClInclude Include="..\editlib\ccrystaltextview.h" />
-    <ClInclude Include="..\editlib\dialogs\ctextmarkerdlg.h" />
-    <ClInclude Include="..\editlib\dialogs\ceditreplacedlg.h" />
-    <ClInclude Include="..\editlib\dialogs\cfindtextdlg.h" />
-    <ClInclude Include="..\editlib\dialogs\chcondlg.h" />
-    <ClInclude Include="..\editlib\utils\cregexp.h" />
-    <ClInclude Include="..\editlib\crystaleditviewex.h" />
-    <ClInclude Include="..\editlib\crystalparser.h" />
-    <ClInclude Include="..\editlib\crystaltextblock.h" />
-    <ClInclude Include="..\editlib\utils\cs2cs.h" />
-    <ClInclude Include="..\editlib\editcmd.h" />
-    <ClInclude Include="..\editlib\editreg.h" />
-    <ClInclude Include="..\editlib\edtlib.h" />
-    <ClInclude Include="..\editlib\utils\filesup.h" />
-    <ClInclude Include="..\editlib\utils\fpattern.h" />
-    <ClInclude Include="..\editlib\dialogs\gotodlg.h" />
-    <ClInclude Include="..\editlib\utils\hqbitmap.h" />
-    <ClInclude Include="..\editlib\utils\icu.hpp" />
-    <ClInclude Include="..\editlib\LineInfo.h" />
-    <ClInclude Include="..\editlib\parsers\crystallineparser.h" />
-    <ClInclude Include="..\editlib\dialogs\memcombo.h" />
-    <ClInclude Include="..\editlib\utils\registry.h" />
-    <ClInclude Include="..\editlib\utils\string_util.h" />
-    <ClInclude Include="..\editlib\SyntaxColors.h" />
-    <ClInclude Include="..\editlib\UndoRecord.h" />
-    <ClInclude Include="..\editlib\ViewableWhitespace.h" />
-    <ClInclude Include="..\editlib\utils\wcwidth.h" />
-    <ClInclude Include="..\editlib\wispelld.h" />
     <ClInclude Include="ChildFrm.h" />
     <ClInclude Include="MainFrm.h" />
     <ClInclude Include="Resource.h" />

diff --git a/Externals/crystaledit/Sample/SampleStatic.vcxproj.filters b/Externals/crystaledit/Sample/SampleStatic.vcxproj.filters
index f040e56..7891195 100644 (file)
--- a/Externals/crystaledit/Sample/SampleStatic.vcxproj.filters
+++ b/Externals/crystaledit/Sample/SampleStatic.vcxproj.filters
@@ -13,21 +13,6 @@
       <UniqueIdentifier>{186c8202-004c-46d6-852e-78a00d619b21}</UniqueIdentifier>
       <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>
     </Filter>
-    <Filter Include="editlib">
-      <UniqueIdentifier>{301e27a4-1572-46c0-85b0-8e6e10fbc56f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="editlib\parsers">
-      <UniqueIdentifier>{0fd2d655-aedc-48db-a5a1-7b0906cbe645}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="editlib\renderers">
-      <UniqueIdentifier>{9e66b30e-2533-465b-a307-24dfe02b73b3}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="editlib\dialogs">
-      <UniqueIdentifier>{44b18b11-2899-4f12-8157-7a29eb580001}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="editlib\utils">
-      <UniqueIdentifier>{b0f8aaea-ace2-43e7-bf2f-75e2201d4396}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="ChildFrm.cpp">
@@ -48,219 +33,9 @@
     <ClCompile Include="StdAfx.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\editlib\ccrystaleditview.cpp">
-      <Filter>editlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\ccrystaltextbuffer.cpp">
-      <Filter>editlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\ccrystaltextview.cpp">
-      <Filter>editlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\ccrystaltextview2.cpp">
-      <Filter>editlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\crystaleditviewex.cpp">
-      <Filter>editlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\crystalparser.cpp">
-      <Filter>editlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\crystaltextblock.cpp">
-      <Filter>editlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\edtlib.cpp">
-      <Filter>editlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\LineInfo.cpp">
-      <Filter>editlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\SyntaxColors.cpp">
-      <Filter>editlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\UndoRecord.cpp">
-      <Filter>editlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\ViewableWhitespace.cpp">
-      <Filter>editlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\parsers\cplusplus.cpp">
-      <Filter>editlib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\parsers\csharp.cpp">
-      <Filter>editlib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\parsers\css.cpp">
-      <Filter>editlib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\parsers\dcl.cpp">
-      <Filter>editlib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\parsers\fortran.cpp">
-      <Filter>editlib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\parsers\html.cpp">
-      <Filter>editlib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\parsers\ini.cpp">
-      <Filter>editlib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\parsers\innosetup.cpp">
-      <Filter>editlib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\parsers\is.cpp">
-      <Filter>editlib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\parsers\java.cpp">
-      <Filter>editlib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\parsers\lisp.cpp">
-      <Filter>editlib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\parsers\nsis.cpp">
-      <Filter>editlib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\parsers\pascal.cpp">
-      <Filter>editlib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\parsers\perl.cpp">
-      <Filter>editlib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\parsers\php.cpp">
-      <Filter>editlib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\parsers\po.cpp">
-      <Filter>editlib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\parsers\powershell.cpp">
-      <Filter>editlib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\parsers\python.cpp">
-      <Filter>editlib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\parsers\rexx.cpp">
-      <Filter>editlib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\parsers\rsrc.cpp">
-      <Filter>editlib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\parsers\ruby.cpp">
-      <Filter>editlib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\parsers\sgml.cpp">
-      <Filter>editlib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\parsers\sh.cpp">
-      <Filter>editlib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\parsers\siod.cpp">
-      <Filter>editlib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\parsers\sql.cpp">
-      <Filter>editlib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\parsers\tcl.cpp">
-      <Filter>editlib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\parsers\tex.cpp">
-      <Filter>editlib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\parsers\verilog.cpp">
-      <Filter>editlib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\parsers\vhdl.cpp">
-      <Filter>editlib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\parsers\xml.cpp">
-      <Filter>editlib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\parsers\rust.cpp">
-      <Filter>editlib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\ccrystaltextmarkers.cpp">
-      <Filter>editlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\parsers\plain.cpp">
-      <Filter>editlib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\parsers\lua.cpp">
-      <Filter>editlib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\parsers\isx.cpp">
-      <Filter>editlib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\parsers\go.cpp">
-      <Filter>editlib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\parsers\asp.cpp">
-      <Filter>editlib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\parsers\batch.cpp">
-      <Filter>editlib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\parsers\basic.cpp">
-      <Filter>editlib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\renderers\ccrystalrendererdirectwrite.cpp">
-      <Filter>editlib\renderers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\renderers\ccrystalrenderergdi.cpp">
-      <Filter>editlib\renderers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\dialogs\cfindtextdlg.cpp">
-      <Filter>editlib\dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\dialogs\chcondlg.cpp">
-      <Filter>editlib\dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\dialogs\ctextmarkerdlg.cpp">
-      <Filter>editlib\dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\dialogs\gotodlg.cpp">
-      <Filter>editlib\dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\dialogs\memcombo.cpp">
-      <Filter>editlib\dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\utils\cregexp.cpp">
-      <Filter>editlib\utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\utils\cs2cs.cpp">
-      <Filter>editlib\utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\utils\filesup.cpp">
-      <Filter>editlib\utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\utils\fpattern.cpp">
-      <Filter>editlib\utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\utils\icu.cpp">
-      <Filter>editlib\utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\utils\registry.cpp">
-      <Filter>editlib\utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\utils\string_util.cpp">
-      <Filter>editlib\utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\utils\wcwidth.cpp">
-      <Filter>editlib\utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\parsers\crystallineparser.cpp">
-      <Filter>editlib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\dialogs\ceditreplacedlg.cpp">
-      <Filter>editlib\dialogs</Filter>
-    </ClCompile>
     <ClCompile Include="..\editlib\utils\hqbitmap.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\editlib\parsers\javascript.cpp">
-      <Filter>editlib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\editlib\parsers\autoit.cpp">
-      <Filter>editlib\parsers</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Sample.rc">
@@ -289,105 +64,6 @@
     <ClInclude Include="StdAfx.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\editlib\ccrystaleditview.h">
-      <Filter>editlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\editlib\ccrystaltextbuffer.h">
-      <Filter>editlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\editlib\ccrystaltextview.h">
-      <Filter>editlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\editlib\crystaleditviewex.h">
-      <Filter>editlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\editlib\crystalparser.h">
-      <Filter>editlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\editlib\crystaltextblock.h">
-      <Filter>editlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\editlib\editcmd.h">
-      <Filter>editlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\editlib\editreg.h">
-      <Filter>editlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\editlib\edtlib.h">
-      <Filter>editlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\editlib\LineInfo.h">
-      <Filter>editlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\editlib\SyntaxColors.h">
-      <Filter>editlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\editlib\UndoRecord.h">
-      <Filter>editlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\editlib\ViewableWhitespace.h">
-      <Filter>editlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\editlib\wispelld.h">
-      <Filter>editlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\editlib\ccrystaltextmarkers.h">
-      <Filter>editlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\editlib\parsers\crystallineparser.h">
-      <Filter>editlib\parsers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\editlib\renderers\ccrystalrenderer.h">
-      <Filter>editlib\renderers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\editlib\renderers\ccrystalrendererdirectwrite.h">
-      <Filter>editlib\renderers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\editlib\renderers\ccrystalrenderergdi.h">
-      <Filter>editlib\renderers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\editlib\dialogs\ceditreplacedlg.h">
-      <Filter>editlib\dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="..\editlib\dialogs\chcondlg.h">
-      <Filter>editlib\dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="..\editlib\dialogs\cfindtextdlg.h">
-      <Filter>editlib\dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="..\editlib\dialogs\ctextmarkerdlg.h">
-      <Filter>editlib\dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="..\editlib\dialogs\gotodlg.h">
-      <Filter>editlib\dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="..\editlib\utils\cregexp.h">
-      <Filter>editlib\utils</Filter>
-    </ClInclude>
-    <ClInclude Include="..\editlib\utils\cs2cs.h">
-      <Filter>editlib\utils</Filter>
-    </ClInclude>
-    <ClInclude Include="..\editlib\utils\filesup.h">
-      <Filter>editlib\utils</Filter>
-    </ClInclude>
-    <ClInclude Include="..\editlib\utils\fpattern.h">
-      <Filter>editlib\utils</Filter>
-    </ClInclude>
-    <ClInclude Include="..\editlib\utils\icu.hpp">
-      <Filter>editlib\utils</Filter>
-    </ClInclude>
-    <ClInclude Include="..\editlib\utils\registry.h">
-      <Filter>editlib\utils</Filter>
-    </ClInclude>
-    <ClInclude Include="..\editlib\utils\string_util.h">
-      <Filter>editlib\utils</Filter>
-    </ClInclude>
-    <ClInclude Include="..\editlib\utils\wcwidth.h">
-      <Filter>editlib\utils</Filter>
-    </ClInclude>
-    <ClInclude Include="..\editlib\dialogs\memcombo.h">
-      <Filter>editlib\dialogs</Filter>
-    </ClInclude>
     <ClInclude Include="..\editlib\utils\hqbitmap.h">
       <Filter>Header Files</Filter>
     </ClInclude>

diff --git a/Externals/crystaledit/Sample/SampleStatic.vs2017.sln b/Externals/crystaledit/Sample/SampleStatic.vs2017.sln
index 42d94b9..de153d8 100644 (file)
--- a/Externals/crystaledit/Sample/SampleStatic.vs2017.sln
+++ b/Externals/crystaledit/Sample/SampleStatic.vs2017.sln
@@ -8,7 +8,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icudata", "..\icudata\icuda
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "..\test\test.vcxproj", "{D358EAE3-AE53-4292-9384-6DB97E8B8D40}"\r
 EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editlib", "..\editlib\editlib.vcxitems", "{7515AC3C-389A-44CD-B940-A59DDE5B8AE3}"\r
+EndProject\r
 Global\r
+       GlobalSection(SharedMSBuildProjectFiles) = preSolution\r
+               ..\editlib\editlib.vcxitems*{7515ac3c-389a-44cd-b940-a59dde5b8ae3}*SharedItemsImports = 9\r
+               ..\editlib\editlib.vcxitems*{c347d6ae-7a2b-4ed0-97ad-2595e1c5d7dd}*SharedItemsImports = 4\r
+       EndGlobalSection\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|Win32 = Debug|Win32\r
                Debug|x64 = Debug|x64\r

diff --git a/Externals/crystaledit/Sample/SampleStatic.vs2019.sln b/Externals/crystaledit/Sample/SampleStatic.vs2019.sln
index ef6275a..a66274c 100644 (file)
--- a/Externals/crystaledit/Sample/SampleStatic.vs2019.sln
+++ b/Externals/crystaledit/Sample/SampleStatic.vs2019.sln
@@ -9,7 +9,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icudata", "..\icudata\icuda
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "..\test\test.vcxproj", "{D358EAE3-AE53-4292-9384-6DB97E8B8D40}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editlib", "..\editlib\editlib.vcxitems", "{7515AC3C-389A-44CD-B940-A59DDE5B8AE3}"
+EndProject
 Global
+       GlobalSection(SharedMSBuildProjectFiles) = preSolution
+               ..\editlib\editlib.vcxitems*{c347d6ae-7a2b-4ed0-97ad-2595e1c5d7dd}*SharedItemsImports = 4
+       EndGlobalSection
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
                Debug|x64 = Debug|x64

diff --git a/Externals/crystaledit/editlib/editlib.vcxitems b/Externals/crystaledit/editlib/editlib.vcxitems
new file mode 100644 (file)
index 0000000..e5401cc
--- /dev/null
+++ b/Externals/crystaledit/editlib/editlib.vcxitems
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <ItemsProjectGuid>{7515ac3c-389a-44cd-b940-a59dde5b8ae3}</ItemsProjectGuid>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectCapability Include="SourceItemsFromImports" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="$(MSBuildThisFileDirectory)ccrystaleditview.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)ccrystaltextbuffer.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)ccrystaltextmarkers.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)ccrystaltextview.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)ccrystaltextview2.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)crystaleditviewex.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)crystalparser.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)crystaltextblock.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)dialogs\ceditreplacedlg.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)dialogs\cfindtextdlg.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)dialogs\chcondlg.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)dialogs\ctextmarkerdlg.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)dialogs\gotodlg.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)dialogs\memcombo.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)LineInfo.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\asp.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\autoit.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\basic.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\batch.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\cplusplus.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\crystallineparser.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\csharp.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\css.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\dcl.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\fortran.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\go.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\html.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\ini.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\innosetup.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\is.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\isx.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\java.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\javascript.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\lisp.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\lua.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\nsis.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\pascal.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\perl.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\php.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\plain.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\po.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\powershell.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\python.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\rexx.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\rsrc.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\ruby.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\rust.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\sgml.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\sh.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\siod.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\sql.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\tcl.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\tex.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\verilog.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\vhdl.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\xml.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)renderers\ccrystalrendererdirectwrite.cpp">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)renderers\ccrystalrenderergdi.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)SyntaxColors.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)UndoRecord.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)utils\cregexp.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)utils\cregexp_poco.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)utils\cs2cs.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)utils\filesup.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)utils\fpattern.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)utils\hqbitmap.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)utils\icu.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)utils\registry.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)utils\string_util.cpp">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)utils\wcwidth.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)ViewableWhitespace.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="$(MSBuildThisFileDirectory)ccrystaleditview.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)ccrystaltextbuffer.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)ccrystaltextmarkers.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)ccrystaltextview.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)crystaleditviewex.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)crystallineparser.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)crystalparser.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)crystaltextblock.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)dialogs\ceditreplacedlg.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)dialogs\cfindtextdlg.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)dialogs\chcondlg.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)dialogs\ctextmarkerdlg.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)dialogs\gotodlg.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)dialogs\memcombo.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)editcmd.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)editreg.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)edtlib.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)LineInfo.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)renderers\ccrystalrenderer.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)renderers\ccrystalrendererdirectwrite.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)renderers\ccrystalrenderergdi.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)SyntaxColors.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)UndoRecord.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)utils\cregexp.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)utils\cs2cs.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)utils\filesup.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)utils\fpattern.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)utils\hqbitmap.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)utils\icu.hpp" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)utils\registry.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)utils\string_util.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)utils\wcwidth.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)ViewableWhitespace.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)wispelld.h" />
+  </ItemGroup>
+</Project>
\ No newline at end of file

diff --git a/Externals/crystaledit/editlib/editlib.vcxitems.filters b/Externals/crystaledit/editlib/editlib.vcxitems.filters
new file mode 100644 (file)
index 0000000..5c78ee7
--- /dev/null
+++ b/Externals/crystaledit/editlib/editlib.vcxitems.filters
@@ -0,0 +1,348 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Utils">
+      <UniqueIdentifier>{751f47a6-029e-4270-ae4b-0934e924e6ac}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Dialogs">
+      <UniqueIdentifier>{130c92db-be9c-4f56-9280-35528bd2d346}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{140ff583-705c-43c8-9970-86fe11cd2513}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Parsers">
+      <UniqueIdentifier>{2497dcf8-8599-4ee1-bdfd-7bf45135fe7b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Parsers\Source Files">
+      <UniqueIdentifier>{d7a55908-11e7-4998-8fa3-58edccce8271}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Parsers\Header Files">
+      <UniqueIdentifier>{25298fd9-8651-4619-a2bb-937549116f40}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Renderers">
+      <UniqueIdentifier>{3fe0d48d-7410-4c0b-83dc-0c1d7a146ea9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{f9221a78-ee81-4242-b77b-d48189ff3f1c}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="$(MSBuildThisFileDirectory)ccrystaleditview.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)ccrystaltextbuffer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)ccrystaltextmarkers.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)ccrystaltextview.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)ccrystaltextview2.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)crystaleditviewex.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)crystalparser.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)crystaltextblock.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)LineInfo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)SyntaxColors.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)UndoRecord.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)ViewableWhitespace.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\asp.cpp">
+      <Filter>Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\autoit.cpp">
+      <Filter>Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\basic.cpp">
+      <Filter>Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\batch.cpp">
+      <Filter>Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\crystallineparser.cpp">
+      <Filter>Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\javascript.cpp">
+      <Filter>Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\cplusplus.cpp">
+      <Filter>Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\csharp.cpp">
+      <Filter>Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\css.cpp">
+      <Filter>Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\dcl.cpp">
+      <Filter>Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\fortran.cpp">
+      <Filter>Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\go.cpp">
+      <Filter>Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\html.cpp">
+      <Filter>Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\ini.cpp">
+      <Filter>Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\innosetup.cpp">
+      <Filter>Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\is.cpp">
+      <Filter>Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\isx.cpp">
+      <Filter>Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\java.cpp">
+      <Filter>Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\lisp.cpp">
+      <Filter>Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\lua.cpp">
+      <Filter>Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\nsis.cpp">
+      <Filter>Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\pascal.cpp">
+      <Filter>Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\perl.cpp">
+      <Filter>Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\php.cpp">
+      <Filter>Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\plain.cpp">
+      <Filter>Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\po.cpp">
+      <Filter>Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\powershell.cpp">
+      <Filter>Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\python.cpp">
+      <Filter>Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\rexx.cpp">
+      <Filter>Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\rsrc.cpp">
+      <Filter>Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\ruby.cpp">
+      <Filter>Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\rust.cpp">
+      <Filter>Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\sgml.cpp">
+      <Filter>Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\sh.cpp">
+      <Filter>Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\siod.cpp">
+      <Filter>Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\sql.cpp">
+      <Filter>Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\tcl.cpp">
+      <Filter>Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\tex.cpp">
+      <Filter>Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\verilog.cpp">
+      <Filter>Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\vhdl.cpp">
+      <Filter>Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)parsers\xml.cpp">
+      <Filter>Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)utils\hqbitmap.cpp">
+      <Filter>Utils</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)utils\cregexp_poco.cpp">
+      <Filter>Utils</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)utils\cs2cs.cpp">
+      <Filter>Utils</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)utils\filesup.cpp">
+      <Filter>Utils</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)utils\fpattern.cpp">
+      <Filter>Utils</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)utils\icu.cpp">
+      <Filter>Utils</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)utils\registry.cpp">
+      <Filter>Utils</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)utils\string_util.cpp">
+      <Filter>Utils</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)utils\wcwidth.cpp">
+      <Filter>Utils</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)renderers\ccrystalrendererdirectwrite.cpp">
+      <Filter>Renderers</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)renderers\ccrystalrenderergdi.cpp">
+      <Filter>Renderers</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)dialogs\ceditreplacedlg.cpp">
+      <Filter>Dialogs</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)dialogs\cfindtextdlg.cpp">
+      <Filter>Dialogs</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)dialogs\chcondlg.cpp">
+      <Filter>Dialogs</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)dialogs\ctextmarkerdlg.cpp">
+      <Filter>Dialogs</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)dialogs\gotodlg.cpp">
+      <Filter>Dialogs</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)dialogs\memcombo.cpp">
+      <Filter>Dialogs</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)utils\cregexp.cpp">
+      <Filter>Utils</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="$(MSBuildThisFileDirectory)ccrystaleditview.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)ccrystaltextbuffer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)ccrystaltextmarkers.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)ccrystaltextview.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)crystaleditviewex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)crystalparser.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)crystaltextblock.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)editcmd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)editreg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)edtlib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)LineInfo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)SyntaxColors.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)UndoRecord.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)ViewableWhitespace.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)wispelld.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)crystallineparser.h">
+      <Filter>Parsers\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)utils\hqbitmap.h">
+      <Filter>Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)utils\cregexp.h">
+      <Filter>Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)utils\cs2cs.h">
+      <Filter>Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)utils\filesup.h">
+      <Filter>Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)utils\fpattern.h">
+      <Filter>Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)utils\icu.hpp">
+      <Filter>Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)utils\registry.h">
+      <Filter>Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)utils\string_util.h">
+      <Filter>Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)utils\wcwidth.h">
+      <Filter>Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)renderers\ccrystalrenderer.h">
+      <Filter>Renderers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)renderers\ccrystalrendererdirectwrite.h">
+      <Filter>Renderers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)renderers\ccrystalrenderergdi.h">
+      <Filter>Renderers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)dialogs\ceditreplacedlg.h">
+      <Filter>Dialogs</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)dialogs\cfindtextdlg.h">
+      <Filter>Dialogs</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)dialogs\chcondlg.h">
+      <Filter>Dialogs</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)dialogs\ctextmarkerdlg.h">
+      <Filter>Dialogs</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)dialogs\gotodlg.h">
+      <Filter>Dialogs</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)dialogs\memcombo.h">
+      <Filter>Dialogs</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file

diff --git a/Externals/crystaledit/editlib/utils/cregexp.cpp b/Externals/crystaledit/editlib/utils/cregexp.cpp
index c4a8ea8..f89a63c 100644 (file)
--- a/Externals/crystaledit/editlib/utils/cregexp.cpp
+++ b/Externals/crystaledit/editlib/utils/cregexp.cpp
@@ -15,6 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////
 
 #include "StdAfx.h"
+#if !__has_include(<Poco/RegularExpression.h>)
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -1208,3 +1209,5 @@ int main() {
 }
 
 #endif
+
+#endif

diff --git a/Externals/crystaledit/editlib/utils/cregexp_poco.cpp b/Externals/crystaledit/editlib/utils/cregexp_poco.cpp
index 6f87c44..8ec68a9 100644 (file)
--- a/Externals/crystaledit/editlib/utils/cregexp_poco.cpp
+++ b/Externals/crystaledit/editlib/utils/cregexp_poco.cpp
@@ -15,6 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////
 
 #include "StdAfx.h"
+#if __has_include(<Poco/RegularExpression.h>)
 #include <cassert>
 #include <cstdio>
 #include <cstdlib>
@@ -285,3 +286,4 @@ int RxReplace(LPCTSTR rep, LPCTSTR Src, int /*len*/, RxMatchRes match, LPTSTR *D
     *Dest = dest;
     return 0;
 }
+#endif

diff --git a/Src/Merge.vcxproj b/Src/Merge.vcxproj
index b2f1369..a55a8eb 100644 (file)
--- a/Src/Merge.vcxproj
+++ b/Src/Merge.vcxproj
@@ -89,6 +89,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
   <ImportGroup Label="ExtensionSettings">\r
   </ImportGroup>\r
+  <ImportGroup Label="Shared">\r
+    <Import Project="..\Externals\crystaledit\editlib\editlib.vcxitems" Label="Shared" />\r
+  </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|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
@@ -434,80 +437,6 @@
     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\asp.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\autoit.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\basic.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\batch.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaleditview.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\crystallineparser.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\javascript.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\renderers\ccrystalrendererdirectwrite.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\renderers\ccrystalrenderergdi.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\dialogs\ceditreplacedlg.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\dialogs\cfindtextdlg.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\dialogs\chcondlg.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\cplusplus.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\utils\hqbitmap.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\utils\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\utils\cs2cs.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\csharp.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\css.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\dialogs\ctextmarkerdlg.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\dcl.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\utils\filesup.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\fortran.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\utils\fpattern.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\go.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\dialogs\gotodlg.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\html.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\utils\icu.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\ini.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\innosetup.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\is.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\isx.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\java.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\LineInfo.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\lisp.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\lua.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\dialogs\memcombo.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\nsis.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\pascal.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\perl.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\php.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\plain.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\po.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\powershell.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\python.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\utils\registry.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\rexx.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\rsrc.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\ruby.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\rust.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\sgml.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\sh.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\siod.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\sql.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\utils\string_util.cpp">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\SyntaxColors.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\tcl.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\tex.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\UndoRecord.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\verilog.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\vhdl.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\ViewableWhitespace.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\utils\wcwidth.cpp" />\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\xml.cpp" />\r
     <ClCompile Include="..\Externals\gtest\src\gtest-all.cc">\r
       <ExcludedFromBuild>true</ExcludedFromBuild>\r
     </ClCompile>\r
@@ -1091,40 +1020,6 @@
     <ClInclude Include="..\Externals\boost\boost\config.hpp" />\r
     <ClInclude Include="..\Externals\boost\boost\config\compiler\visualc.hpp" />\r
     <ClInclude Include="..\Externals\boost\boost\config\select_compiler_config.hpp" />\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaleditview.h" />\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\renderers\ccrystalrenderer.h" />\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\renderers\ccrystalrendererdirectwrite.h" />\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\renderers\ccrystalrenderergdi.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\dialogs\ceditreplacedlg.h" />\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\dialogs\cfindtextdlg.h" />\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\dialogs\chcondlg.h" />\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\utils\hqbitmap.h" />\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\utils\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\utils\cs2cs.h" />\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\dialogs\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\utils\filesup.h" />\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\utils\fpattern.h" />\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\dialogs\gotodlg.h" />\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\utils\icu.hpp" />\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\LineInfo.h" />\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\crystallineparser.h" />\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\dialogs\memcombo.h" />\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\utils\registry.h" />\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\utils\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\utils\wcwidth.h" />\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\wispelld.h" />\r
     <ClInclude Include="..\Externals\gtest\include\gtest\gtest-printers.h">\r
       <ExcludedFromBuild>true</ExcludedFromBuild>\r
     </ClInclude>\r
@@ -1402,4 +1297,4 @@
       <UserProperties RESOURCE_FILE="Merge.rc" />\r
     </VisualStudio>\r
   </ProjectExtensions>\r
-</Project>\r
+</Project>
\ No newline at end of file

diff --git a/Src/Merge.vcxproj.filters b/Src/Merge.vcxproj.filters
index 8c6cbba..2e55408 100644 (file)
--- a/Src/Merge.vcxproj.filters
+++ b/Src/Merge.vcxproj.filters
@@ -1,1805 +1,1466 @@
-<?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="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="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\Common">
-      <UniqueIdentifier>{297182f0-e39d-4ac4-9df3-315882ce9e07}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Boost">
-      <UniqueIdentifier>{09e2ca67-f223-4fd6-b380-aca4a63886b5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Boost\config">
-      <UniqueIdentifier>{6c139b98-08bf-4639-84f9-3848ad990352}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Boost\config\compiler">
-      <UniqueIdentifier>{48b82f25-08b5-43e5-bc19-abd5bf4f0ea7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="GNU diffutils">
-      <UniqueIdentifier>{16e1af2b-75c9-4deb-b49f-819018df0478}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="MergeTest">
-      <UniqueIdentifier>{63f0497b-0d8f-4660-b727-dac620d74635}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="MergeTest\gtest">
-      <UniqueIdentifier>{67c954df-e54f-4070-9c75-68ef52a00e03}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="MFCGui\Common\Header Files">
-      <UniqueIdentifier>{30ca9a5d-4b26-4d57-b39b-f7fe3e7c7abc}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="MFCGui\Common\Source Files">
-      <UniqueIdentifier>{567b3ec4-d358-4290-8a27-4e87c11cfb55}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="MFCGui\Dialogs\Source Files">
-      <UniqueIdentifier>{befda2e3-2f20-4080-89b1-803c6935bf05}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="MFCGui\Dialogs\Header Files">
-      <UniqueIdentifier>{a988a22b-3d18-4d67-bf3e-8912bf9940f2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="MFCGui\PropertyPages">
-      <UniqueIdentifier>{c6b39fdf-7c68-42c3-895b-da25bb6e51b4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="MFCGui\PropertyPages\Source Files">
-      <UniqueIdentifier>{bc0e280a-2589-4e45-883e-1eb0db655c07}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="MFCGui\PropertyPages\Header Files">
-      <UniqueIdentifier>{313fa20e-cf17-46e5-8ebf-c16b07786225}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Common">
-      <UniqueIdentifier>{9545a3ff-6867-464f-a244-755ed58529e0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Common\Header Files">
-      <UniqueIdentifier>{cef4b0e0-5b0d-4f4f-8522-fe6eb66f3fa5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Common\Source Files">
-      <UniqueIdentifier>{ae04066b-7462-4a9b-8120-6d72fa5fe73e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="EditLib\Source Files">
-      <UniqueIdentifier>{7ebea8c0-3335-4e4d-b56f-222e5c5b700a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="EditLib\Header Files">
-      <UniqueIdentifier>{295aa90c-8c94-400a-a4e3-84cac2b447f0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="EditLib\Parsers">
-      <UniqueIdentifier>{740d4dd9-ab31-47b8-9cbb-8e6a7b5db4fe}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="EditLib\Parsers\Source Files">
-      <UniqueIdentifier>{dcc78107-52dc-43d1-b4f7-7acf8c71fce4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="EditLib\Parsers\Header Files">
-      <UniqueIdentifier>{1de6d090-09d8-423e-9a39-92e523334e4e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Compare Engines\Source Files">
-      <UniqueIdentifier>{e80d7ff2-f4b2-4c37-8db5-e26835cd90cf}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Compare Engines\Header Files">
-      <UniqueIdentifier>{e0f6e1ca-9725-4a97-81da-adf12e7a4e42}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="xdiff">
-      <UniqueIdentifier>{aaf72b76-2f45-4d7e-9d2a-5692d58cdce4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="xdiff\Source Files">
-      <UniqueIdentifier>{ffdcde37-3059-47f3-b99a-77204a77a641}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="xdiff\Header Files">
-      <UniqueIdentifier>{41bd2806-5584-4fb1-9fa4-350c8a7fb3d4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="EditLib\Utils">
-      <UniqueIdentifier>{a1ade59c-1377-4a77-af3c-aa89d87976f5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="EditLib\Renderers">
-      <UniqueIdentifier>{1e6cd5a8-d791-4b93-8751-c647f73eb81c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="EditLib\Dialogs">
-      <UniqueIdentifier>{e1d3b9c7-671f-4e3a-9696-a7afc96dda83}</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="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="FileFlags.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="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="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="OptionsInit.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="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="stringdiffs.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="TempFile.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="UniMarkdownFile.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\analyze.c">
-      <Filter>GNU diffutils</Filter>
-    </ClCompile>
-    <ClCompile Include="diffutils\lib\cmpbuf.c">
-      <Filter>GNU diffutils</Filter>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\context.c">
-      <Filter>GNU diffutils</Filter>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\Diff.cpp">
-      <Filter>GNU diffutils</Filter>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\ed.c">
-      <Filter>GNU diffutils</Filter>
-    </ClCompile>
-    <ClCompile Include="diffutils\GnuVersion.c">
-      <Filter>GNU diffutils</Filter>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\ifdef.c">
-      <Filter>GNU diffutils</Filter>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\io.c">
-      <Filter>GNU diffutils</Filter>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\normal.c">
-      <Filter>GNU diffutils</Filter>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\side.c">
-      <Filter>GNU diffutils</Filter>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\util.c">
-      <Filter>GNU diffutils</Filter>
-    </ClCompile>
-    <ClCompile Include="MergeApp.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="7zCommon.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="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="OptionsDirColors.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PatchTool.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="JumpList.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OptionsCustomColors.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ImgMergeFrm.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Merge7zFormatMergePluginImpl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="LineFiltersList.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="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>GNU diffutils</Filter>
-    </ClCompile>
-    <ClCompile Include="MergeEditSplitterView.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Test.cpp">
-      <Filter>MergeTest</Filter>
-    </ClCompile>
-    <ClCompile Include="TestMain.cpp">
-      <Filter>MergeTest</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\gtest\src\gtest-all.cc">
-      <Filter>MergeTest\gtest</Filter>
-    </ClCompile>
-    <ClCompile Include="Merge7zFormatShellImpl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="pch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OptionsPanel.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MergeEditFrm.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\BCMenu.cpp">
-      <Filter>MFCGui\Common\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\Bitmap.cpp">
-      <Filter>MFCGui\Common\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\CMoveConstraint.cpp">
-      <Filter>MFCGui\Common\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\ColorButton.cpp">
-      <Filter>MFCGui\Common\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\LanguageSelect.cpp">
-      <Filter>MFCGui\Common\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\MDITabBar.cpp">
-      <Filter>MFCGui\Common\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\MessageBoxDialog.cpp">
-      <Filter>MFCGui\Common\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\PropertyPageHost.cpp">
-      <Filter>MFCGui\Common\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\scbarcf.cpp">
-      <Filter>MFCGui\Common\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\scbarg.cpp">
-      <Filter>MFCGui\Common\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\sizecbar.cpp">
-      <Filter>MFCGui\Common\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\SortHeaderCtrl.cpp">
-      <Filter>MFCGui\Common\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\SplitterWndEx.cpp">
-      <Filter>MFCGui\Common\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\SuperComboBox.cpp">
-      <Filter>MFCGui\Common\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="AboutDlg.cpp">
-      <Filter>MFCGui\Dialogs\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="CompareStatisticsDlg.cpp">
-      <Filter>MFCGui\Dialogs\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ConfirmFolderCopyDlg.cpp">
-      <Filter>MFCGui\Dialogs\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DirCmpReportDlg.cpp">
-      <Filter>MFCGui\Dialogs\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DirColsDlg.cpp">
-      <Filter>MFCGui\Dialogs\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FileFiltersDlg.cpp">
-      <Filter>MFCGui\Dialogs\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="LineFiltersDlg.cpp">
-      <Filter>MFCGui\Dialogs\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SubeditList.cpp">
-      <Filter>MFCGui\Dialogs\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="LoadSaveCodepageDlg.cpp">
-      <Filter>MFCGui\Dialogs\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PatchDlg.cpp">
-      <Filter>MFCGui\Dialogs\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PluginsListDlg.cpp">
-      <Filter>MFCGui\Dialogs\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\PreferencesDlg.cpp">
-      <Filter>MFCGui\Dialogs\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SaveClosingDlg.cpp">
-      <Filter>MFCGui\Dialogs\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SelectUnpackerDlg.cpp">
-      <Filter>MFCGui\Dialogs\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SharedFilterDlg.cpp">
-      <Filter>MFCGui\Dialogs\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="TestFilterDlg.cpp">
-      <Filter>MFCGui\Dialogs\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="WMGotoDlg.cpp">
-      <Filter>MFCGui\Dialogs\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PropArchive.cpp">
-      <Filter>MFCGui\PropertyPages\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PropBackups.cpp">
-      <Filter>MFCGui\PropertyPages\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PropCodepage.cpp">
-      <Filter>MFCGui\PropertyPages\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PropCompare.cpp">
-      <Filter>MFCGui\PropertyPages\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PropCompareBinary.cpp">
-      <Filter>MFCGui\PropertyPages\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PropCompareFolder.cpp">
-      <Filter>MFCGui\PropertyPages\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PropCompareImage.cpp">
-      <Filter>MFCGui\PropertyPages\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PropDirColors.cpp">
-      <Filter>MFCGui\PropertyPages\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PropEditor.cpp">
-      <Filter>MFCGui\PropertyPages\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PropGeneral.cpp">
-      <Filter>MFCGui\PropertyPages\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PropMarkerColors.cpp">
-      <Filter>MFCGui\PropertyPages\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PropRegistry.cpp">
-      <Filter>MFCGui\PropertyPages\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PropShell.cpp">
-      <Filter>MFCGui\PropertyPages\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PropSyntaxColors.cpp">
-      <Filter>MFCGui\PropertyPages\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PropTextColors.cpp">
-      <Filter>MFCGui\PropertyPages\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\ClipBoard.cpp">
-      <Filter>Common\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\coretools.cpp">
-      <Filter>Common\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\lwdisp.c">
-      <Filter>Common\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\RegKey.cpp">
-      <Filter>Common\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\ShellFileOperations.cpp">
-      <Filter>Common\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\UniFile.cpp">
-      <Filter>Common\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\UnicodeString.cpp">
-      <Filter>Common\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\unicoder.cpp">
-      <Filter>Common\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\RegOptionsMgr.cpp">
-      <Filter>Common\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\PidlContainer.cpp">
-      <Filter>Common\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="common\OptionsMgr.cpp">
-      <Filter>Common\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\multiformatText.cpp">
-      <Filter>Common\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\ExConverter.cpp">
-      <Filter>Common\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\varprop.cpp">
-      <Filter>Common\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaleditview.cpp">
-      <Filter>EditLib\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.cpp">
-      <Filter>EditLib\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.cpp">
-      <Filter>EditLib\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview.cpp">
-      <Filter>EditLib\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview2.cpp">
-      <Filter>EditLib\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\crystaleditviewex.cpp">
-      <Filter>EditLib\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\crystalparser.cpp">
-      <Filter>EditLib\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\crystaltextblock.cpp">
-      <Filter>EditLib\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\LineInfo.cpp">
-      <Filter>EditLib\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\SyntaxColors.cpp">
-      <Filter>EditLib\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\UndoRecord.cpp">
-      <Filter>EditLib\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\ViewableWhitespace.cpp">
-      <Filter>EditLib\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="CompareEngines\BinaryCompare.cpp">
-      <Filter>Compare Engines\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="CompareEngines\ByteComparator.cpp">
-      <Filter>Compare Engines\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="CompareEngines\ByteCompare.cpp">
-      <Filter>Compare Engines\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="CompareEngines\TimeSizeCompare.cpp">
-      <Filter>Compare Engines\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="CompareEngines\Wrap_DiffUtils.cpp">
-      <Filter>Compare Engines\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\VersionInfo.cpp">
-      <Filter>Common\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\ShellContextMenu.cpp">
-      <Filter>Common\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\xdiff\xdiffi.c">
-      <Filter>xdiff\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\xdiff\xemit.c">
-      <Filter>xdiff\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\xdiff\xhistogram.c">
-      <Filter>xdiff\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\xdiff\xmerge.c">
-      <Filter>xdiff\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\xdiff\xpatience.c">
-      <Filter>xdiff\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\xdiff\xprepare.c">
-      <Filter>xdiff\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\xdiff\xutils.c">
-      <Filter>xdiff\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="xdiff_gnudiff_compat.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MergeFrameCommon.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DirSelectFilesDlg.cpp">
-      <Filter>MFCGui\Dialogs\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="WindowsManagerDialog.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Concurrent.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PropMergeColors.cpp">
-      <Filter>MFCGui\PropertyPages\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PropColorSchemes.cpp">
-      <Filter>MFCGui\PropertyPages\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="CompareEngines\ImageCompare.cpp">
-      <Filter>Compare Engines\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\utils\cregexp_poco.cpp">
-      <Filter>EditLib\Utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\utils\cs2cs.cpp">
-      <Filter>EditLib\Utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\utils\filesup.cpp">
-      <Filter>EditLib\Utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\utils\fpattern.cpp">
-      <Filter>EditLib\Utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\utils\icu.cpp">
-      <Filter>EditLib\Utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\utils\registry.cpp">
-      <Filter>EditLib\Utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\utils\string_util.cpp">
-      <Filter>EditLib\Utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\utils\wcwidth.cpp">
-      <Filter>EditLib\Utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\asp.cpp">
-      <Filter>EditLib\Parsers\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\basic.cpp">
-      <Filter>EditLib\Parsers\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\batch.cpp">
-      <Filter>EditLib\Parsers\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\dialogs\ceditreplacedlg.cpp">
-      <Filter>EditLib\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\dialogs\cfindtextdlg.cpp">
-      <Filter>EditLib\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\dialogs\chcondlg.cpp">
-      <Filter>EditLib\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\dialogs\ctextmarkerdlg.cpp">
-      <Filter>EditLib\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\dialogs\gotodlg.cpp">
-      <Filter>EditLib\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\cplusplus.cpp">
-      <Filter>EditLib\Parsers\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\csharp.cpp">
-      <Filter>EditLib\Parsers\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\dcl.cpp">
-      <Filter>EditLib\Parsers\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\fortran.cpp">
-      <Filter>EditLib\Parsers\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\go.cpp">
-      <Filter>EditLib\Parsers\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\html.cpp">
-      <Filter>EditLib\Parsers\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\ini.cpp">
-      <Filter>EditLib\Parsers\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\innosetup.cpp">
-      <Filter>EditLib\Parsers\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\is.cpp">
-      <Filter>EditLib\Parsers\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\isx.cpp">
-      <Filter>EditLib\Parsers\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\java.cpp">
-      <Filter>EditLib\Parsers\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\lisp.cpp">
-      <Filter>EditLib\Parsers\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\lua.cpp">
-      <Filter>EditLib\Parsers\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\nsis.cpp">
-      <Filter>EditLib\Parsers\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\pascal.cpp">
-      <Filter>EditLib\Parsers\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\perl.cpp">
-      <Filter>EditLib\Parsers\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\php.cpp">
-      <Filter>EditLib\Parsers\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\plain.cpp">
-      <Filter>EditLib\Parsers\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\po.cpp">
-      <Filter>EditLib\Parsers\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\powershell.cpp">
-      <Filter>EditLib\Parsers\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\python.cpp">
-      <Filter>EditLib\Parsers\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\rexx.cpp">
-      <Filter>EditLib\Parsers\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\rsrc.cpp">
-      <Filter>EditLib\Parsers\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\ruby.cpp">
-      <Filter>EditLib\Parsers\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\rust.cpp">
-      <Filter>EditLib\Parsers\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\sgml.cpp">
-      <Filter>EditLib\Parsers\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\sh.cpp">
-      <Filter>EditLib\Parsers\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\siod.cpp">
-      <Filter>EditLib\Parsers\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\sql.cpp">
-      <Filter>EditLib\Parsers\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\tcl.cpp">
-      <Filter>EditLib\Parsers\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\tex.cpp">
-      <Filter>EditLib\Parsers\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\verilog.cpp">
-      <Filter>EditLib\Parsers\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\vhdl.cpp">
-      <Filter>EditLib\Parsers\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\xml.cpp">
-      <Filter>EditLib\Parsers\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\dialogs\memcombo.cpp">
-      <Filter>EditLib\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\renderers\ccrystalrendererdirectwrite.cpp">
-      <Filter>EditLib\Renderers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\renderers\ccrystalrenderergdi.cpp">
-      <Filter>EditLib\Renderers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\css.cpp">
-      <Filter>EditLib\Parsers\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\crystallineparser.cpp">
-      <Filter>EditLib\Parsers\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PropCompareTable.cpp">
-      <Filter>MFCGui\PropertyPages\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OpenTableDlg.cpp">
-      <Filter>MFCGui\Dialogs\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="WildcardDropList.cpp">
-      <Filter>MFCGui\PropertyPages\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\utils\hqbitmap.cpp">
-      <Filter>EditLib\Utils</Filter>
-    </ClCompile>
-    <ClCompile Include="SubstitutionFiltersDlg.cpp">
-      <Filter>MFCGui\Dialogs\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\javascript.cpp">
-      <Filter>EditLib\Parsers\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\autoit.cpp">
-      <Filter>EditLib\Parsers\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SubstitutionList.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SubstitutionFiltersList.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PropEditorSyntax.cpp">\r
-      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
+<?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="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="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\Common">\r
+      <UniqueIdentifier>{297182f0-e39d-4ac4-9df3-315882ce9e07}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="Boost">\r
+      <UniqueIdentifier>{09e2ca67-f223-4fd6-b380-aca4a63886b5}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="Boost\config">\r
+      <UniqueIdentifier>{6c139b98-08bf-4639-84f9-3848ad990352}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="Boost\config\compiler">\r
+      <UniqueIdentifier>{48b82f25-08b5-43e5-bc19-abd5bf4f0ea7}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="GNU diffutils">\r
+      <UniqueIdentifier>{16e1af2b-75c9-4deb-b49f-819018df0478}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MergeTest">\r
+      <UniqueIdentifier>{63f0497b-0d8f-4660-b727-dac620d74635}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MergeTest\gtest">\r
+      <UniqueIdentifier>{67c954df-e54f-4070-9c75-68ef52a00e03}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\Common\Header Files">\r
+      <UniqueIdentifier>{30ca9a5d-4b26-4d57-b39b-f7fe3e7c7abc}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\Common\Source Files">\r
+      <UniqueIdentifier>{567b3ec4-d358-4290-8a27-4e87c11cfb55}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\Dialogs\Source Files">\r
+      <UniqueIdentifier>{befda2e3-2f20-4080-89b1-803c6935bf05}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\Dialogs\Header Files">\r
+      <UniqueIdentifier>{a988a22b-3d18-4d67-bf3e-8912bf9940f2}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\PropertyPages">\r
+      <UniqueIdentifier>{c6b39fdf-7c68-42c3-895b-da25bb6e51b4}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\PropertyPages\Source Files">\r
+      <UniqueIdentifier>{bc0e280a-2589-4e45-883e-1eb0db655c07}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\PropertyPages\Header Files">\r
+      <UniqueIdentifier>{313fa20e-cf17-46e5-8ebf-c16b07786225}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="Common">\r
+      <UniqueIdentifier>{9545a3ff-6867-464f-a244-755ed58529e0}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="Common\Header Files">\r
+      <UniqueIdentifier>{cef4b0e0-5b0d-4f4f-8522-fe6eb66f3fa5}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="Common\Source Files">\r
+      <UniqueIdentifier>{ae04066b-7462-4a9b-8120-6d72fa5fe73e}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="Compare Engines\Source Files">\r
+      <UniqueIdentifier>{e80d7ff2-f4b2-4c37-8db5-e26835cd90cf}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="Compare Engines\Header Files">\r
+      <UniqueIdentifier>{e0f6e1ca-9725-4a97-81da-adf12e7a4e42}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="xdiff">\r
+      <UniqueIdentifier>{aaf72b76-2f45-4d7e-9d2a-5692d58cdce4}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="xdiff\Source Files">\r
+      <UniqueIdentifier>{ffdcde37-3059-47f3-b99a-77204a77a641}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="xdiff\Header Files">\r
+      <UniqueIdentifier>{41bd2806-5584-4fb1-9fa4-350c8a7fb3d4}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="charsets.c">\r
+      <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="OptionsEditorSyntax.cpp">\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="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="FileFlags.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="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="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="OptionsInit.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="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="stringdiffs.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="TempFile.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="UniMarkdownFile.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="diffutils\src\analyze.c">\r
+      <Filter>GNU diffutils</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="diffutils\lib\cmpbuf.c">\r
+      <Filter>GNU diffutils</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="diffutils\src\context.c">\r
+      <Filter>GNU diffutils</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="diffutils\src\Diff.cpp">\r
+      <Filter>GNU diffutils</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="diffutils\src\ed.c">\r
+      <Filter>GNU diffutils</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="diffutils\GnuVersion.c">\r
+      <Filter>GNU diffutils</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="diffutils\src\ifdef.c">\r
+      <Filter>GNU diffutils</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="diffutils\src\io.c">\r
+      <Filter>GNU diffutils</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="diffutils\src\normal.c">\r
+      <Filter>GNU diffutils</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="diffutils\src\side.c">\r
+      <Filter>GNU diffutils</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="diffutils\src\util.c">\r
+      <Filter>GNU diffutils</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="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="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="OptionsDirColors.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PatchTool.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="JumpList.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="OptionsCustomColors.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="ImgMergeFrm.cpp">\r
+      <Filter>MFCGui\Source Files</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="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="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="diffutils\src\mystat.cpp">\r
+      <Filter>GNU diffutils</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="MergeEditSplitterView.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Test.cpp">\r
+      <Filter>MergeTest</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="TestMain.cpp">\r
+      <Filter>MergeTest</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\gtest\src\gtest-all.cc">\r
+      <Filter>MergeTest\gtest</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Merge7zFormatShellImpl.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="pch.cpp">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
-  </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="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="FileFlags.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="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="locality.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="OptionsDef.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="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="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="UniMarkdownFile.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="diffutils\lib\cmpbuf.h">
-      <Filter>GNU diffutils</Filter>
-    </ClInclude>
-    <ClInclude Include="diffutils\config.h">
-      <Filter>GNU diffutils</Filter>
-    </ClInclude>
-    <ClInclude Include="diffutils\src\diff.h">
-      <Filter>GNU diffutils</Filter>
-    </ClInclude>
-    <ClInclude Include="diffutils\src\system.h">
-      <Filter>GNU diffutils</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="heksedit.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="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="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="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="OptionsDirColors.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PatchTool.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="JumpList.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="ImgMergeFrm.h">
-      <Filter>MFCGui\Header Files</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="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="OptionsPanel.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DropHandler.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Constants.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="..\Externals\boost\boost\config.hpp">
-      <Filter>Boost</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\boost\boost\config\compiler\visualc.hpp">
-      <Filter>Boost\config\compiler</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\boost\boost\config\select_compiler_config.hpp">
-      <Filter>Boost\config</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Version.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MergeEditSplitterView.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="TestMain.h">
-      <Filter>MergeTest</Filter>
-    </ClInclude>
-    <ClInclude Include="Win_VersionHelper.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\gtest\include\gtest\gtest.h">
-      <Filter>MergeTest\gtest</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\gtest\include\gtest\gtest-printers.h">
-      <Filter>MergeTest\gtest</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\gtest\include\gtest\internal\gtest-port.h">
-      <Filter>MergeTest\gtest</Filter>
-    </ClInclude>
-    <ClInclude Include="Merge7zFormatShellImpl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="pch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MergeEditFrm.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\BCMenu.h">
-      <Filter>MFCGui\Common\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\Bitmap.h">
-      <Filter>MFCGui\Common\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\CMoveConstraint.h">
-      <Filter>MFCGui\Common\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\ColorButton.h">
-      <Filter>MFCGui\Common\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\LanguageSelect.h">
-      <Filter>MFCGui\Common\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\MDITabBar.h">
-      <Filter>MFCGui\Common\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\memdc.h">
-      <Filter>MFCGui\Common\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\MessageBoxDialog.h">
-      <Filter>MFCGui\Common\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\scbarcf.h">
-      <Filter>MFCGui\Common\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\PropertyPageHost.h">
-      <Filter>MFCGui\Common\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\scbarg.h">
-      <Filter>MFCGui\Common\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\sizecbar.h">
-      <Filter>MFCGui\Common\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\SortHeaderCtrl.h">
-      <Filter>MFCGui\Common\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\SplitterWndEx.h">
-      <Filter>MFCGui\Common\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\SuperComboBox.h">
-      <Filter>MFCGui\Common\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="AboutDlg.h">
-      <Filter>MFCGui\Dialogs\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="CompareStatisticsDlg.h">
-      <Filter>MFCGui\Dialogs\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ConfirmFolderCopyDlg.h">
-      <Filter>MFCGui\Dialogs\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DirCmpReportDlg.h">
-      <Filter>MFCGui\Dialogs\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DirColsDlg.h">
-      <Filter>MFCGui\Dialogs\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="FileFiltersDlg.h">
-      <Filter>MFCGui\Dialogs\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="LineFiltersDlg.h">
-      <Filter>MFCGui\Dialogs\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="LoadSaveCodepageDlg.h">
-      <Filter>MFCGui\Dialogs\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PatchDlg.h">
-      <Filter>MFCGui\Dialogs\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PluginsListDlg.h">
-      <Filter>MFCGui\Dialogs\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\PreferencesDlg.h">
-      <Filter>MFCGui\Dialogs\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SaveClosingDlg.h">
-      <Filter>MFCGui\Dialogs\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SelectUnpackerDlg.h">
-      <Filter>MFCGui\Dialogs\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SharedFilterDlg.h">
-      <Filter>MFCGui\Dialogs\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="TestFilterDlg.h">
-      <Filter>MFCGui\Dialogs\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="WMGotoDlg.h">
-      <Filter>MFCGui\Dialogs\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PropArchive.h">
-      <Filter>MFCGui\PropertyPages\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PropBackups.h">
-      <Filter>MFCGui\PropertyPages\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PropCodepage.h">
-      <Filter>MFCGui\PropertyPages\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PropCompare.h">
-      <Filter>MFCGui\PropertyPages\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PropCompareBinary.h">
-      <Filter>MFCGui\PropertyPages\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PropCompareFolder.h">
-      <Filter>MFCGui\PropertyPages\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PropCompareImage.h">
-      <Filter>MFCGui\PropertyPages\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PropDirColors.h">
-      <Filter>MFCGui\PropertyPages\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PropEditor.h">
-      <Filter>MFCGui\PropertyPages\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PropGeneral.h">
-      <Filter>MFCGui\PropertyPages\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PropMarkerColors.h">
-      <Filter>MFCGui\PropertyPages\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PropRegistry.h">
-      <Filter>MFCGui\PropertyPages\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PropShell.h">
-      <Filter>MFCGui\PropertyPages\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PropSyntaxColors.h">
-      <Filter>MFCGui\PropertyPages\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PropTextColors.h">
-      <Filter>MFCGui\PropertyPages\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\ClipBoard.h">
-      <Filter>Common\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\coretools.h">
-      <Filter>Common\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\lwdisp.h">
-      <Filter>Common\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\ExConverter.h">
-      <Filter>Common\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\UniFile.h">
-      <Filter>Common\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\UnicodeString.h">
-      <Filter>Common\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\unicoder.h">
-      <Filter>Common\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\ShellFileOperations.h">
-      <Filter>Common\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\RegOptionsMgr.h">
-      <Filter>Common\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\RegKey.h">
-      <Filter>Common\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\PidlContainer.h">
-      <Filter>Common\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="common\OptionsMgr.h">
-      <Filter>Common\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\varprop.h">
-      <Filter>Common\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\multiformatText.h">
-      <Filter>Common\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaleditview.h">
-      <Filter>EditLib\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.h">
-      <Filter>EditLib\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.h">
-      <Filter>EditLib\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextview.h">
-      <Filter>EditLib\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\crystaleditviewex.h">
-      <Filter>EditLib\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\crystalparser.h">
-      <Filter>EditLib\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\crystaltextblock.h">
-      <Filter>EditLib\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\editreg.h">
-      <Filter>EditLib\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\editcmd.h">
-      <Filter>EditLib\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\edtlib.h">
-      <Filter>EditLib\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\LineInfo.h">
-      <Filter>EditLib\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\SyntaxColors.h">
-      <Filter>EditLib\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\UndoRecord.h">
-      <Filter>EditLib\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\ViewableWhitespace.h">
-      <Filter>EditLib\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\wispelld.h">
-      <Filter>EditLib\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\crystallineparser.h">
-      <Filter>EditLib\Parsers\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="CompareEngines\BinaryCompare.h">
-      <Filter>Compare Engines\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="CompareEngines\ByteComparator.h">
-      <Filter>Compare Engines\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="CompareEngines\ByteCompare.h">
-      <Filter>Compare Engines\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="CompareEngines\TimeSizeCompare.h">
-      <Filter>Compare Engines\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="CompareEngines\Wrap_DiffUtils.h">
-      <Filter>Compare Engines\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\VersionInfo.h">
-      <Filter>Common\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\ShellContextMenu.h">
-      <Filter>Common\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\xdiff\xdiff.h">
-      <Filter>xdiff\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\xdiff\xdiffi.h">
-      <Filter>xdiff\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\xdiff\xemit.h">
-      <Filter>xdiff\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\xdiff\xinclude.h">
-      <Filter>xdiff\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\xdiff\xmacros.h">
-      <Filter>xdiff\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\xdiff\xprepare.h">
-      <Filter>xdiff\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\xdiff\xtypes.h">
-      <Filter>xdiff\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\xdiff\xutils.h">
-      <Filter>xdiff\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="xdiff_gnudiff_compat.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MergeFrameCommon.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DirSelectFilesDlg.h">
-      <Filter>MFCGui\Dialogs\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="WindowsManagerDialog.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Concurrent.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PropMergeColors.h">
-      <Filter>MFCGui\PropertyPages\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PropColorSchemes.h">
-      <Filter>MFCGui\PropertyPages\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="CompareEngines\ImageCompare.h">
-      <Filter>Compare Engines\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\utils\cregexp.h">
-      <Filter>EditLib\Utils</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\utils\cs2cs.h">
-      <Filter>EditLib\Utils</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\utils\filesup.h">
-      <Filter>EditLib\Utils</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\utils\fpattern.h">
-      <Filter>EditLib\Utils</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\utils\icu.hpp">
-      <Filter>EditLib\Utils</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\utils\registry.h">
-      <Filter>EditLib\Utils</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\utils\string_util.h">
-      <Filter>EditLib\Utils</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\utils\wcwidth.h">
-      <Filter>EditLib\Utils</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\dialogs\ceditreplacedlg.h">
-      <Filter>EditLib\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\dialogs\cfindtextdlg.h">
-      <Filter>EditLib\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\dialogs\chcondlg.h">
-      <Filter>EditLib\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\dialogs\ctextmarkerdlg.h">
-      <Filter>EditLib\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\dialogs\gotodlg.h">
-      <Filter>EditLib\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\dialogs\memcombo.h">
-      <Filter>EditLib\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\renderers\ccrystalrenderer.h">
-      <Filter>EditLib\Renderers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\renderers\ccrystalrendererdirectwrite.h">
-      <Filter>EditLib\Renderers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\renderers\ccrystalrenderergdi.h">
-      <Filter>EditLib\Renderers</Filter>
-    </ClInclude>
-    <ClInclude Include="PropCompareTable.h">
-      <Filter>MFCGui\PropertyPages\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OpenTableDlg.h">
-      <Filter>MFCGui\Dialogs\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="WildcardDropList.h">
-      <Filter>MFCGui\PropertyPages\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\utils\hqbitmap.h">
-      <Filter>EditLib\Utils</Filter>
-    </ClInclude>
-    <ClInclude Include="LineFiltersList.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SubstitutionFiltersDlg.h">
-      <Filter>MFCGui\Dialogs\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SubstitutionList.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SubstitutionFiltersList.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
+    <ClCompile Include="OptionsPanel.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="MergeEditFrm.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\BCMenu.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\Bitmap.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\CMoveConstraint.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\ColorButton.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\LanguageSelect.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\MDITabBar.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\MessageBoxDialog.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\PropertyPageHost.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\scbarcf.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\scbarg.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\sizecbar.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\SortHeaderCtrl.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\SplitterWndEx.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\SuperComboBox.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="AboutDlg.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareStatisticsDlg.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="ConfirmFolderCopyDlg.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DirCmpReportDlg.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DirColsDlg.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="FileFiltersDlg.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="LineFiltersDlg.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="SubeditList.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="LoadSaveCodepageDlg.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PatchDlg.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PluginsListDlg.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\PreferencesDlg.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="SaveClosingDlg.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="SelectUnpackerDlg.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="SharedFilterDlg.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="TestFilterDlg.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="WMGotoDlg.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropArchive.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropBackups.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropCodepage.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropCompare.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropCompareBinary.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropCompareFolder.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropCompareImage.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropDirColors.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropEditor.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropGeneral.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropMarkerColors.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropRegistry.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropShell.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropSyntaxColors.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropTextColors.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\ClipBoard.cpp">\r
+      <Filter>Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\coretools.cpp">\r
+      <Filter>Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\lwdisp.c">\r
+      <Filter>Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\RegKey.cpp">\r
+      <Filter>Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\ShellFileOperations.cpp">\r
+      <Filter>Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\UniFile.cpp">\r
+      <Filter>Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\UnicodeString.cpp">\r
+      <Filter>Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\unicoder.cpp">\r
+      <Filter>Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\RegOptionsMgr.cpp">\r
+      <Filter>Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\PidlContainer.cpp">\r
+      <Filter>Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="common\OptionsMgr.cpp">\r
+      <Filter>Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\multiformatText.cpp">\r
+      <Filter>Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\ExConverter.cpp">\r
+      <Filter>Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\varprop.cpp">\r
+      <Filter>Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareEngines\BinaryCompare.cpp">\r
+      <Filter>Compare Engines\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareEngines\ByteComparator.cpp">\r
+      <Filter>Compare Engines\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareEngines\ByteCompare.cpp">\r
+      <Filter>Compare Engines\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareEngines\TimeSizeCompare.cpp">\r
+      <Filter>Compare Engines\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareEngines\Wrap_DiffUtils.cpp">\r
+      <Filter>Compare Engines\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\VersionInfo.cpp">\r
+      <Filter>Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\ShellContextMenu.cpp">\r
+      <Filter>Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\xdiff\xdiffi.c">\r
+      <Filter>xdiff\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\xdiff\xemit.c">\r
+      <Filter>xdiff\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\xdiff\xhistogram.c">\r
+      <Filter>xdiff\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\xdiff\xmerge.c">\r
+      <Filter>xdiff\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\xdiff\xpatience.c">\r
+      <Filter>xdiff\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\xdiff\xprepare.c">\r
+      <Filter>xdiff\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\xdiff\xutils.c">\r
+      <Filter>xdiff\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="xdiff_gnudiff_compat.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="MergeFrameCommon.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DirSelectFilesDlg.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="WindowsManagerDialog.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Concurrent.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropMergeColors.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropColorSchemes.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareEngines\ImageCompare.cpp">\r
+      <Filter>Compare Engines\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropCompareTable.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="OpenTableDlg.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="WildcardDropList.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="SubstitutionFiltersDlg.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="SubstitutionList.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="SubstitutionFiltersList.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropEditorSyntax.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="OptionsEditorSyntax.cpp">\r
+      <Filter>Source Files</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="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="FileFlags.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="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="locality.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="OptionsDef.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="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="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="UniMarkdownFile.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="diffutils\lib\cmpbuf.h">\r
+      <Filter>GNU diffutils</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="diffutils\config.h">\r
+      <Filter>GNU diffutils</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="diffutils\src\diff.h">\r
+      <Filter>GNU diffutils</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="diffutils\src\system.h">\r
+      <Filter>GNU diffutils</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="heksedit.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="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="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="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="OptionsDirColors.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PatchTool.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="JumpList.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="ImgMergeFrm.h">\r
+      <Filter>MFCGui\Header Files</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="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="OptionsPanel.h">\r
+      <Filter>MFCGui\Header Files</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="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="..\Externals\boost\boost\config.hpp">\r
+      <Filter>Boost</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\boost\boost\config\compiler\visualc.hpp">\r
+      <Filter>Boost\config\compiler</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\boost\boost\config\select_compiler_config.hpp">\r
+      <Filter>Boost\config</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Version.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="MergeEditSplitterView.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="TestMain.h">\r
+      <Filter>MergeTest</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Win_VersionHelper.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\gtest\include\gtest\gtest.h">\r
+      <Filter>MergeTest\gtest</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\gtest\include\gtest\gtest-printers.h">\r
+      <Filter>MergeTest\gtest</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\gtest\include\gtest\internal\gtest-port.h">\r
+      <Filter>MergeTest\gtest</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Merge7zFormatShellImpl.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="pch.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="MergeEditFrm.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\BCMenu.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\Bitmap.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\CMoveConstraint.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\ColorButton.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\LanguageSelect.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\MDITabBar.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\memdc.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\MessageBoxDialog.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\scbarcf.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\PropertyPageHost.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\scbarg.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\sizecbar.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\SortHeaderCtrl.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\SplitterWndEx.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\SuperComboBox.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="AboutDlg.h">\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="CompareStatisticsDlg.h">\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="ConfirmFolderCopyDlg.h">\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DirCmpReportDlg.h">\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DirColsDlg.h">\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="FileFiltersDlg.h">\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="LineFiltersDlg.h">\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="LoadSaveCodepageDlg.h">\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PatchDlg.h">\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PluginsListDlg.h">\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\PreferencesDlg.h">\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="SaveClosingDlg.h">\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="SelectUnpackerDlg.h">\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="SharedFilterDlg.h">\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="TestFilterDlg.h">\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="WMGotoDlg.h">\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropArchive.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropBackups.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropCodepage.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropCompare.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropCompareBinary.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropCompareFolder.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropCompareImage.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropDirColors.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropEditor.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropGeneral.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropMarkerColors.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropRegistry.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropShell.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropSyntaxColors.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropTextColors.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\ClipBoard.h">\r
+      <Filter>Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\coretools.h">\r
+      <Filter>Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\lwdisp.h">\r
+      <Filter>Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\ExConverter.h">\r
+      <Filter>Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\UniFile.h">\r
+      <Filter>Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\UnicodeString.h">\r
+      <Filter>Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\unicoder.h">\r
+      <Filter>Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\ShellFileOperations.h">\r
+      <Filter>Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\RegOptionsMgr.h">\r
+      <Filter>Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\RegKey.h">\r
+      <Filter>Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\PidlContainer.h">\r
+      <Filter>Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="common\OptionsMgr.h">\r
+      <Filter>Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\varprop.h">\r
+      <Filter>Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\multiformatText.h">\r
+      <Filter>Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="CompareEngines\BinaryCompare.h">\r
+      <Filter>Compare Engines\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="CompareEngines\ByteComparator.h">\r
+      <Filter>Compare Engines\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="CompareEngines\ByteCompare.h">\r
+      <Filter>Compare Engines\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="CompareEngines\TimeSizeCompare.h">\r
+      <Filter>Compare Engines\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="CompareEngines\Wrap_DiffUtils.h">\r
+      <Filter>Compare Engines\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\VersionInfo.h">\r
+      <Filter>Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\ShellContextMenu.h">\r
+      <Filter>Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\xdiff\xdiff.h">\r
+      <Filter>xdiff\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\xdiff\xdiffi.h">\r
+      <Filter>xdiff\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\xdiff\xemit.h">\r
+      <Filter>xdiff\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\xdiff\xinclude.h">\r
+      <Filter>xdiff\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\xdiff\xmacros.h">\r
+      <Filter>xdiff\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\xdiff\xprepare.h">\r
+      <Filter>xdiff\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\xdiff\xtypes.h">\r
+      <Filter>xdiff\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\xdiff\xutils.h">\r
+      <Filter>xdiff\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="xdiff_gnudiff_compat.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="MergeFrameCommon.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DirSelectFilesDlg.h">\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="WindowsManagerDialog.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Concurrent.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropMergeColors.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropColorSchemes.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="CompareEngines\ImageCompare.h">\r
+      <Filter>Compare Engines\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropCompareTable.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="OpenTableDlg.h">\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="WildcardDropList.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="LineFiltersList.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="SubstitutionFiltersDlg.h">\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="SubstitutionList.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="SubstitutionFiltersList.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
     <ClInclude Include="PropEditorSyntax.h">\r
       <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
     </ClInclude>\r
     <ClInclude Include="OptionsEditorSyntax.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-  </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>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="Merge.rc">
-      <Filter>MFCGui\Source Files</Filter>
-    </ResourceCompile>
-    <ResourceCompile Include="Merge2.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
+  </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
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ResourceCompile Include="Merge.rc">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ResourceCompile>\r
+    <ResourceCompile Include="Merge2.rc">\r
+      <Filter>Resource Files</Filter>\r
+    </ResourceCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file

diff --git a/WinMerge.vs2017.sln b/WinMerge.vs2017.sln
index 32aaca7..828019c 100644 (file)
--- a/WinMerge.vs2017.sln
+++ b/WinMerge.vs2017.sln
@@ -42,7 +42,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GUITests", "Testing\GoogleT
 EndProject\r
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{2A835469-516E-4B8A-93F1-33EF70B80981}"\r
 EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editlib", "Externals\crystaledit\editlib\editlib.vcxitems", "{7515AC3C-389A-44CD-B940-A59DDE5B8AE3}"\r
+EndProject\r
 Global\r
+       GlobalSection(SharedMSBuildProjectFiles) = preSolution\r
+               Externals\crystaledit\editlib\editlib.vcxitems*{9fda4af0-ccfd-4812-bdb9-53efedb32bde}*SharedItemsImports = 4\r
+       EndGlobalSection\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|Win32 = Debug|Win32\r
                Debug|x64 = Debug|x64\r

diff --git a/WinMerge.vs2019.sln b/WinMerge.vs2019.sln
index 6d4f4f3..590aea6 100644 (file)
--- a/WinMerge.vs2019.sln
+++ b/WinMerge.vs2019.sln
@@ -44,7 +44,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GUITests", "Testing\GoogleT
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{2A835469-516E-4B8A-93F1-33EF70B80981}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editlib", "Externals\crystaledit\editlib\editlib.vcxitems", "{7515AC3C-389A-44CD-B940-A59DDE5B8AE3}"
+EndProject
 Global
+       GlobalSection(SharedMSBuildProjectFiles) = preSolution
+               Externals\crystaledit\editlib\editlib.vcxitems*{9fda4af0-ccfd-4812-bdb9-53efedb32bde}*SharedItemsImports = 4
+       EndGlobalSection
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
                Debug|x64 = Debug|x64