Reduce compilation time (2)

[winmerge-jp/winmerge-jp.git] / Src / Merge.vs2019.vcxproj.filters

diff --git a/Src/Merge.vs2019.vcxproj.filters b/Src/Merge.vs2019.vcxproj.filters
index 0961791..e8aa02d 100644 (file)
--- a/Src/Merge.vs2019.vcxproj.filters
+++ b/Src/Merge.vs2019.vcxproj.filters
@@ -1,1553 +1,1559 @@
-<?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="EditLib\parsers">
-      <UniqueIdentifier>{740d4dd9-ab31-47b8-9cbb-8e6a7b5db4fe}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="MFCGui">
-      <UniqueIdentifier>{caf52667-921a-47aa-84a3-f277aac15107}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="MFCGui\Source Files">
-      <UniqueIdentifier>{5dc3ba0d-6755-48f8-ad11-df56b167b514}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="MFCGui\Header Files">
-      <UniqueIdentifier>{10ce7aff-bcfd-4ed0-98c3-766226c4c89e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="MFCGui\Dialogs">
-      <UniqueIdentifier>{d520b3a7-c530-4053-8766-07c26ed85f85}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="MFCGui\Dialogs\PropertyPages">
-      <UniqueIdentifier>{c6b39fdf-7c68-42c3-895b-da25bb6e51b4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="MFCGui\Common">
-      <UniqueIdentifier>{297182f0-e39d-4ac4-9df3-315882ce9e07}</UniqueIdentifier>
-    </Filter>
-    <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>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="charsets.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="codepage_detect.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="CompareOptions.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="CompareStats.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ConfigLog.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ConflictFileParser.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\coretools.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DiffContext.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DiffFileData.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DiffFileInfo.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DiffItem.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DiffItemList.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DiffList.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DiffThread.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DiffWrapper.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DirCmpReport.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DirItem.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DirScan.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DirTravel.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="dllpstub.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Environment.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FileFilter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FileFilterHelper.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FileFilterMgr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FileTextEncoding.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FileTransform.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FileVersion.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FilterCommentsManager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FilterList.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FolderCmp.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="locality.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\lwdisp.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="markdown.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MergeCmdLineInfo.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MovedBlocks.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MovedLines.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\multiformatText.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OptionsInit.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="common\OptionsMgr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PatchHTML.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PathContext.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="paths.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\PidlContainer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PluginManager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Plugins.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ProjectFile.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\RegKey.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\RegOptionsMgr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\ShellFileOperations.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="stringdiffs.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="TempFile.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\unicoder.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\UnicodeString.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\UniFile.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="UniMarkdownFile.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\varprop.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="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="CompareEngines\ByteComparator.cpp">
-      <Filter>Compare Engines</Filter>
-    </ClCompile>
-    <ClCompile Include="CompareEngines\ByteCompare.cpp">
-      <Filter>Compare Engines</Filter>
-    </ClCompile>
-    <ClCompile Include="CompareEngines\TimeSizeCompare.cpp">
-      <Filter>Compare Engines</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaleditview.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview2.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\ceditreplacedlg.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\LineInfo.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\SyntaxColors.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\UndoRecord.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\ViewableWhitespace.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\cfindtextdlg.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\chcondlg.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\crystaleditviewex.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\crystalparser.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\crystaltextblock.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\cs2cs.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\filesup.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\fpattern.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\gotodlg.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\memcombo.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\registry.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\statbar.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\string_util.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\batch.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\asp.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\basic.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\cplusplus.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\csharp.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\css.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\dcl.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\fortran.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\html.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\ini.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\innosetup.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\java.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\is.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\lisp.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\nsis.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\perl.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\pascal.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\php.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\po.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\powershell.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\python.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\rexx.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\rsrc.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\sgml.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\ruby.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\sh.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\siod.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\sql.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\tcl.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\tex.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\verilog.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\vhdl.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\xml.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\cregexp_poco.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="MergeApp.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="7zCommon.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ChildFrm.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\CMoveConstraint.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\ColorButton.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DiffTextBuffer.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DiffViewBar.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DirDoc.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DirFrame.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DirView.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="EditorFilepathBar.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="EncodingErrorBar.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FileActionScript.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FileOrFolderSelect.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FilepathEdit.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="GhostTextBuffer.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="GhostTextView.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="HexMergeDoc.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="HexMergeFrm.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="HexMergeView.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="LocationBar.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="LocationView.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MainFrm.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Merge.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MergeDoc.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MergeDocDiffSync.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MergeDocEncoding.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MergeDocLineDiffs.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MergeEditView.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OpenDoc.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OpenFrm.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OpenView.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="StdAfx.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\LanguageSelect.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\ExConverter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DirCompProgressBar.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OptionsFont.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OptionsSyntaxColors.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OptionsDiffColors.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OptionsDiffOptions.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PropArchive.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClCompile>
-    <ClCompile Include="PropBackups.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClCompile>
-    <ClCompile Include="PropCodepage.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClCompile>
-    <ClCompile Include="PropColors.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClCompile>
-    <ClCompile Include="PropCompare.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClCompile>
-    <ClCompile Include="PropCompareFolder.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClCompile>
-    <ClCompile Include="PropEditor.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClCompile>
-    <ClCompile Include="PropGeneral.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClCompile>
-    <ClCompile Include="PropRegistry.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClCompile>
-    <ClCompile Include="PropShell.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClCompile>
-    <ClCompile Include="PropSyntaxColors.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClCompile>
-    <ClCompile Include="PropTextColors.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClCompile>
-    <ClCompile Include="AboutDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="DirCmpReportDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="DirColsDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="LineFiltersDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="LoadSaveCodepageDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="PatchDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="PluginsListDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="SaveClosingDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="SelectUnpackerDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="SharedFilterDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="TestFilterDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="WMGotoDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="FileFiltersDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="CompareStatisticsDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="ConfirmFolderCopyDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="PatchTool.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\SortHeaderCtrl.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\PreferencesDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="JumpList.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\ClipBoard.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OptionsCustomColors.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ImgMergeFrm.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PropCompareImage.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClCompile>
-    <ClCompile Include="Merge7zFormatMergePluginImpl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="LineFiltersList.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="CompareEngines\BinaryCompare.cpp">
-      <Filter>Compare Engines</Filter>
-    </ClCompile>
-    <ClCompile Include="PropCompareBinary.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClCompile>
-    <ClCompile Include="DirViewColItems.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DirActions.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DropHandler.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OptionsDef.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OptionsPanel.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\scbarg.cpp">
-      <Filter>MFCGui\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\scbarcf.cpp">
-      <Filter>MFCGui\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\sizecbar.cpp">
-      <Filter>MFCGui\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\BCMenu.cpp">
-      <Filter>MFCGui\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\MDITabBar.cpp">
-      <Filter>MFCGui\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\MessageBoxDialog.cpp">
-      <Filter>MFCGui\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\SuperComboBox.cpp">
-      <Filter>MFCGui\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\SplitterWndEx.cpp">
-      <Filter>MFCGui\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\Bitmap.cpp">
-      <Filter>MFCGui\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\Picture.cpp">
-      <Filter>MFCGui\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\ShellContextMenu.cpp">
-      <Filter>MFCGui\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\PropertyPageHost.cpp">
-      <Filter>MFCGui\Common</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="..\Externals\crystaledit\editlib\go.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\rust.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\ctextmarkerdlg.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="PropMarkerColors.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\VersionInfo.cpp">
-      <Filter>MFCGui\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="MergeEditSplitterView.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="CompareEngines\Wrap_DiffUtils.cpp">
-      <Filter>Compare Engines</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>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{e8f63c02-8bf9-425d-88d0-831ca188bbdf}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{ff78af1d-3eee-4c01-8be1-27cf73dfe922}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{4e04f59d-bb70-4e67-a8d7-2b01fb6d0cd8}</UniqueIdentifier>\r
+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>\r
+    </Filter>\r
+    <Filter Include="EditLib">\r
+      <UniqueIdentifier>{84d4664c-e7ea-4d24-8d55-b1303c40b7f4}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="ChangeLogs">\r
+      <UniqueIdentifier>{aefb7247-d6e5-411d-9cc5-4a12f5efda4a}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="Compare Engines">\r
+      <UniqueIdentifier>{b889169f-de55-4db7-ad06-423f6438fa90}</UniqueIdentifier>\r
+      <Extensions>cpp;c;h</Extensions>\r
+    </Filter>\r
+    <Filter Include="EditLib\parsers">\r
+      <UniqueIdentifier>{740d4dd9-ab31-47b8-9cbb-8e6a7b5db4fe}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui">\r
+      <UniqueIdentifier>{caf52667-921a-47aa-84a3-f277aac15107}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\Source Files">\r
+      <UniqueIdentifier>{5dc3ba0d-6755-48f8-ad11-df56b167b514}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\Header Files">\r
+      <UniqueIdentifier>{10ce7aff-bcfd-4ed0-98c3-766226c4c89e}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\Dialogs">\r
+      <UniqueIdentifier>{d520b3a7-c530-4053-8766-07c26ed85f85}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\Dialogs\PropertyPages">\r
+      <UniqueIdentifier>{c6b39fdf-7c68-42c3-895b-da25bb6e51b4}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\Common">\r
+      <UniqueIdentifier>{297182f0-e39d-4ac4-9df3-315882ce9e07}</UniqueIdentifier>\r
+    </Filter>\r
+    <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
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="charsets.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="codepage_detect.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareOptions.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareStats.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="ConfigLog.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="ConflictFileParser.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\coretools.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffContext.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffFileData.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffFileInfo.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffItem.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffItemList.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffList.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffThread.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffWrapper.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DirCmpReport.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DirItem.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DirScan.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DirTravel.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="dllpstub.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Environment.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="FileFilter.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="FileFilterHelper.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="FileFilterMgr.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="FileTextEncoding.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="FileTransform.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="FileVersion.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="FilterCommentsManager.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="FilterList.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="FolderCmp.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="locality.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\lwdisp.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="markdown.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="MergeCmdLineInfo.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="MovedBlocks.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="MovedLines.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\multiformatText.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="OptionsInit.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="common\OptionsMgr.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PatchHTML.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PathContext.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="paths.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\PidlContainer.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PluginManager.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Plugins.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="ProjectFile.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\RegKey.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\RegOptionsMgr.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\ShellFileOperations.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="stringdiffs.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="TempFile.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\unicoder.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\UnicodeString.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\UniFile.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="UniMarkdownFile.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\varprop.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="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="CompareEngines\ByteComparator.cpp">\r
+      <Filter>Compare Engines</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareEngines\ByteCompare.cpp">\r
+      <Filter>Compare Engines</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareEngines\TimeSizeCompare.cpp">\r
+      <Filter>Compare Engines</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaleditview.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview2.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ceditreplacedlg.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\LineInfo.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\SyntaxColors.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\UndoRecord.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ViewableWhitespace.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\cfindtextdlg.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\chcondlg.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\crystaleditviewex.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\crystalparser.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\crystaltextblock.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\cs2cs.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\filesup.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\fpattern.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\gotodlg.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\memcombo.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\registry.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\statbar.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\string_util.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\batch.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\asp.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\basic.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\cplusplus.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\csharp.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\css.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\dcl.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\fortran.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\html.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ini.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\innosetup.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\java.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\is.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\lisp.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\nsis.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\perl.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\pascal.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\php.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\po.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\powershell.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\python.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\rexx.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\rsrc.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\sgml.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ruby.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\sh.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\siod.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\sql.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\tcl.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\tex.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\verilog.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\vhdl.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\xml.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\cregexp_poco.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="MergeApp.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="7zCommon.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="ChildFrm.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\CMoveConstraint.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\ColorButton.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffTextBuffer.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffViewBar.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DirDoc.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DirFrame.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DirView.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="EditorFilepathBar.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="EncodingErrorBar.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="FileActionScript.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="FileOrFolderSelect.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="FilepathEdit.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="GhostTextBuffer.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="GhostTextView.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="HexMergeDoc.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="HexMergeFrm.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="HexMergeView.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="LocationBar.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="LocationView.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="MainFrm.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Merge.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="MergeDoc.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="MergeDocDiffSync.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="MergeDocEncoding.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="MergeDocLineDiffs.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="MergeEditView.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="OpenDoc.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="OpenFrm.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="OpenView.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="StdAfx.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\LanguageSelect.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\ExConverter.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DirCompProgressBar.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="OptionsFont.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="OptionsSyntaxColors.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="OptionsDiffColors.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="OptionsDiffOptions.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropArchive.cpp">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropBackups.cpp">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropCodepage.cpp">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropColors.cpp">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropCompare.cpp">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropCompareFolder.cpp">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropEditor.cpp">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropGeneral.cpp">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropRegistry.cpp">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropShell.cpp">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropSyntaxColors.cpp">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropTextColors.cpp">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="AboutDlg.cpp">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DirCmpReportDlg.cpp">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DirColsDlg.cpp">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="LineFiltersDlg.cpp">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="LoadSaveCodepageDlg.cpp">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PatchDlg.cpp">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PluginsListDlg.cpp">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="SaveClosingDlg.cpp">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="SelectUnpackerDlg.cpp">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="SharedFilterDlg.cpp">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="TestFilterDlg.cpp">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="WMGotoDlg.cpp">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="FileFiltersDlg.cpp">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareStatisticsDlg.cpp">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="ConfirmFolderCopyDlg.cpp">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PatchTool.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\SortHeaderCtrl.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\PreferencesDlg.cpp">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="JumpList.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\ClipBoard.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="OptionsCustomColors.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="ImgMergeFrm.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropCompareImage.cpp">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Merge7zFormatMergePluginImpl.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="LineFiltersList.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareEngines\BinaryCompare.cpp">\r
+      <Filter>Compare Engines</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropCompareBinary.cpp">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="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="Common\scbarg.cpp">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\scbarcf.cpp">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\sizecbar.cpp">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\BCMenu.cpp">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\MDITabBar.cpp">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\MessageBoxDialog.cpp">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\SuperComboBox.cpp">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\SplitterWndEx.cpp">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\Bitmap.cpp">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\Picture.cpp">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\ShellContextMenu.cpp">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\PropertyPageHost.cpp">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="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="..\Externals\crystaledit\editlib\go.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\rust.cpp">\r
+      <Filter>EditLib\parsers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ctextmarkerdlg.cpp">\r
+      <Filter>EditLib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropMarkerColors.cpp">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\VersionInfo.cpp">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="MergeEditSplitterView.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareEngines\Wrap_DiffUtils.cpp">\r
+      <Filter>Compare Engines</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="..\Externals\crystaledit\editlib\wcwidth.cpp">\r
       <Filter>EditLib</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="Common\coretools.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DiffContext.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DiffFileData.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DiffFileInfo.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DiffItem.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DiffItemList.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DiffList.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DiffThread.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DiffWrapper.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DirCmpReport.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DirItem.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DirReportTypes.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DirScan.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DirTravel.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="dllpstub.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Environment.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Exceptions.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="FileFilter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="FileFilterHelper.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="FileFilterMgr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="FileLocation.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="files.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="FileTextEncoding.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="FileTextStats.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="FileTransform.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="FileVersion.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="FilterCommentsManager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="FilterList.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="FolderCmp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="IAbortable.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="IntToIntMap.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="LineFiltersList.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="locality.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\lwdisp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="markdown.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MergeCmdLineInfo.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MovedLines.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\multiformatText.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OptionsDef.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="common\OptionsMgr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PatchHTML.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PathContext.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="paths.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\PidlContainer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PluginManager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Plugins.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ProjectFile.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\RegKey.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\RegOptionsMgr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\ShellFileOperations.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="stringdiffs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="stringdiffsi.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="TempFile.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\unicoder.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\UnicodeString.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\UniFile.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="UniMarkdownFile.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\varprop.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="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="CompareEngines\ByteComparator.h">
-      <Filter>Compare Engines</Filter>
-    </ClInclude>
-    <ClInclude Include="CompareEngines\ByteCompare.h">
-      <Filter>Compare Engines</Filter>
-    </ClInclude>
-    <ClInclude Include="CompareEngines\TimeSizeCompare.h">
-      <Filter>Compare Engines</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaleditview.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextview.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\ceditreplacedlg.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\LineInfo.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\SyntaxColors.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\UndoRecord.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\ViewableWhitespace.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\cfindtextdlg.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\chcondlg.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\cregexp.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\crystaleditviewex.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\crystalparser.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\crystaltextblock.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\cs2cs.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\editcmd.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\editreg.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\edtlib.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\filesup.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\fpattern.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\gotodlg.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\memcombo.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\registry.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\statbar.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\string_util.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\wispelld.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="StdAfx.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Resource.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OpenFrm.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OpenView.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OpenDoc.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MergeEditView.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MergeEditStatus.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MergeDoc.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Merge.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MainFrm.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="LocationView.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="LocationBar.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="IOptionsPanel.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="HexMergeFrm.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
+    </ClCompile>\r
+    <ClCompile Include="pch.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="OptionsPanel.cpp">\r
+      <Filter>MFCGui\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="Common\coretools.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DiffContext.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DiffFileData.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DiffFileInfo.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DiffItem.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DiffItemList.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DiffList.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DiffThread.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DiffWrapper.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DirCmpReport.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DirItem.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DirReportTypes.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DirScan.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DirTravel.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="dllpstub.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Environment.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Exceptions.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="FileFilter.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="FileFilterHelper.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="FileFilterMgr.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="FileLocation.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="files.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="FileTextEncoding.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="FileTextStats.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="FileTransform.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="FileVersion.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="FilterCommentsManager.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="FilterList.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="FolderCmp.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="IAbortable.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="IntToIntMap.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="LineFiltersList.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="locality.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\lwdisp.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="markdown.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="MergeCmdLineInfo.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="MovedLines.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\multiformatText.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="OptionsDef.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="common\OptionsMgr.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PatchHTML.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PathContext.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="paths.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\PidlContainer.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PluginManager.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Plugins.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="ProjectFile.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\RegKey.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\RegOptionsMgr.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\ShellFileOperations.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="stringdiffs.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="stringdiffsi.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="TempFile.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\unicoder.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\UnicodeString.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\UniFile.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="UniMarkdownFile.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\varprop.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="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="CompareEngines\ByteComparator.h">\r
+      <Filter>Compare Engines</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="CompareEngines\ByteCompare.h">\r
+      <Filter>Compare Engines</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="CompareEngines\TimeSizeCompare.h">\r
+      <Filter>Compare Engines</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaleditview.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextview.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\ceditreplacedlg.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\LineInfo.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\SyntaxColors.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\UndoRecord.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\ViewableWhitespace.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\cfindtextdlg.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\chcondlg.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\cregexp.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\crystaleditviewex.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\crystalparser.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\crystaltextblock.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\cs2cs.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\editcmd.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\editreg.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\edtlib.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\filesup.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\fpattern.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\gotodlg.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\memcombo.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\registry.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\statbar.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\string_util.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\wispelld.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="StdAfx.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Resource.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="OpenFrm.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="OpenView.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="OpenDoc.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="MergeEditView.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="MergeEditStatus.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="MergeDoc.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Merge.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="MainFrm.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="LocationView.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="LocationBar.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="IOptionsPanel.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="HexMergeFrm.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
     <ClInclude Include="heksedit.h">\r
       <Filter>MFCGui\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="HexMergeDoc.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="GhostTextView.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="GhostTextBuffer.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="FileOrFolderSelect.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ChildFrm.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DiffViewBar.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DiffTextBuffer.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DirDoc.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DirFrame.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DirView.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="EditorFilepathBar.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="EncodingErrorBar.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="FileActionScript.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="FilepathEdit.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\LanguageSelect.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\coretypes.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="IListCtrlImpl.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MergeLineFlags.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MergeApp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\ExConverter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DirCompProgressBar.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Diff3.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OptionsFont.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OptionsSyntaxColors.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OptionsDiffColors.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OptionsDiffOptions.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PropArchive.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClInclude>
-    <ClInclude Include="PropBackups.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClInclude>
-    <ClInclude Include="PropCodepage.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClInclude>
-    <ClInclude Include="PropColors.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClInclude>
-    <ClInclude Include="PropCompare.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClInclude>
-    <ClInclude Include="PropCompareFolder.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClInclude>
-    <ClInclude Include="PropEditor.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClInclude>
-    <ClInclude Include="PropGeneral.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClInclude>
-    <ClInclude Include="PropRegistry.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClInclude>
-    <ClInclude Include="PropShell.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClInclude>
-    <ClInclude Include="PropSyntaxColors.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClInclude>
-    <ClInclude Include="PropTextColors.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClInclude>
-    <ClInclude Include="AboutDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="CompareStatisticsDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="ConfirmFolderCopyDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="DirCmpReportDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="FileFiltersDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="LoadSaveCodepageDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="LineFiltersDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="PatchDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="PluginsListDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="SaveClosingDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="SelectUnpackerDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="SharedFilterDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="TestFilterDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="WMGotoDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="DirColsDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="PatchTool.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\PreferencesDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="JumpList.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\ClipBoard.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OptionsCustomColors.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="7zCommon.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ImgMergeFrm.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PropCompareImage.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClInclude>
-    <ClInclude Include="IMergeDoc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Merge7zFormatMergePluginImpl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Merge7zFormatRegister.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="CompareEngines\BinaryCompare.h">
-      <Filter>Compare Engines</Filter>
-    </ClInclude>
-    <ClInclude Include="DirViewColItems.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DirActions.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="HexMergeView.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PropCompareBinary.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\SuperComboBox.h">
-      <Filter>MFCGui\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\SortHeaderCtrl.h">
-      <Filter>MFCGui\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\CMoveConstraint.h">
-      <Filter>MFCGui\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\MDITabBar.h">
-      <Filter>MFCGui\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\PropertyPageHost.h">
-      <Filter>MFCGui\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\SplitterWndEx.h">
-      <Filter>MFCGui\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\sizecbar.h">
-      <Filter>MFCGui\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\scbarg.h">
-      <Filter>MFCGui\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\scbarcf.h">
-      <Filter>MFCGui\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\MessageBoxDialog.h">
-      <Filter>MFCGui\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="OptionsPanel.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\Bitmap.h">
-      <Filter>MFCGui\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\memdc.h">
-      <Filter>MFCGui\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\ShellContextMenu.h">
-      <Filter>MFCGui\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\BCMenu.h">
-      <Filter>MFCGui\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\ColorButton.h">
-      <Filter>MFCGui\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\Picture.h">
-      <Filter>MFCGui\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="DropHandler.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Constants.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="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\crystaledit\editlib\ccrystaltextmarkers.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="PropMarkerColors.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\ctextmarkerdlg.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <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="Common\VersionInfo.h">
-      <Filter>MFCGui\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="MergeEditSplitterView.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="CompareEngines\Wrap_DiffUtils.h">
-      <Filter>Compare Engines</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="HexMergeDoc.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="GhostTextView.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="GhostTextBuffer.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="FileOrFolderSelect.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="ChildFrm.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DiffViewBar.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DiffTextBuffer.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DirDoc.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DirFrame.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DirView.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="EditorFilepathBar.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="EncodingErrorBar.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="FileActionScript.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="FilepathEdit.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\LanguageSelect.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\coretypes.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="IListCtrlImpl.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="MergeLineFlags.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="MergeApp.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\ExConverter.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DirCompProgressBar.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Diff3.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="OptionsFont.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="OptionsSyntaxColors.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="OptionsDiffColors.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="OptionsDiffOptions.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropArchive.h">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropBackups.h">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropCodepage.h">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropColors.h">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropCompare.h">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropCompareFolder.h">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropEditor.h">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropGeneral.h">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropRegistry.h">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropShell.h">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropSyntaxColors.h">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropTextColors.h">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="AboutDlg.h">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="CompareStatisticsDlg.h">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="ConfirmFolderCopyDlg.h">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DirCmpReportDlg.h">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="FileFiltersDlg.h">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="LoadSaveCodepageDlg.h">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="LineFiltersDlg.h">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PatchDlg.h">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PluginsListDlg.h">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="SaveClosingDlg.h">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="SelectUnpackerDlg.h">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="SharedFilterDlg.h">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="TestFilterDlg.h">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="WMGotoDlg.h">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DirColsDlg.h">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PatchTool.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\PreferencesDlg.h">\r
+      <Filter>MFCGui\Dialogs</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="JumpList.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\ClipBoard.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="OptionsCustomColors.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="7zCommon.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="ImgMergeFrm.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropCompareImage.h">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="IMergeDoc.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Merge7zFormatMergePluginImpl.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Merge7zFormatRegister.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="CompareEngines\BinaryCompare.h">\r
+      <Filter>Compare Engines</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DirViewColItems.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DirActions.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="HexMergeView.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropCompareBinary.h">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\SuperComboBox.h">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\SortHeaderCtrl.h">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\CMoveConstraint.h">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\MDITabBar.h">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\PropertyPageHost.h">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\SplitterWndEx.h">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\sizecbar.h">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\scbarg.h">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\scbarcf.h">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\MessageBoxDialog.h">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="OptionsPanel.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\Bitmap.h">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\memdc.h">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\ShellContextMenu.h">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\BCMenu.h">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\ColorButton.h">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\Picture.h">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DropHandler.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Constants.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="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\crystaledit\editlib\ccrystaltextmarkers.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PropMarkerColors.h">\r
+      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\ctextmarkerdlg.h">\r
+      <Filter>EditLib</Filter>\r
+    </ClInclude>\r
+    <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="Common\VersionInfo.h">\r
+      <Filter>MFCGui\Common</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="MergeEditSplitterView.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="CompareEngines\Wrap_DiffUtils.h">\r
+      <Filter>Compare Engines</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="..\Externals\crystaledit\editlib\wcwidth.h">\r
       <Filter>EditLib</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>
+    <ClInclude Include="pch.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="res\binarydiff.ico">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\both.bmp">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\equalbinary.ico">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\equalfile.ico">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\error.ico">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\fileskip.ico">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\folder.ico">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\folderskip.ico">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\folderup.ico">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\folderup_disable.ico">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\hand.cur">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\left.bmp">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\left_to_browse.bmp">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\left_to_right.bmp">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\lfile.ico">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\lfolder.ico">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\Merge.ico">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\Merge.rc2">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\MergeDir.ico">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\MergeDoc.ico">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\MergeProject.ico">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\mg_cur.cur">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\move_left_to_browse.bmp">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\move_right_to_browse.bmp">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\notequalfile.ico">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\rfile.ico">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\rfolder.ico">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\right.bmp">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\right_to_browse.bmp">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\right_to_left.bmp">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\sigma.ico">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="CHANGELO">\r
+      <Filter>ChangeLogs</Filter>\r
+    </None>\r
+    <None Include="..\Docs\Users\ChangeLog.txt">\r
+      <Filter>ChangeLogs</Filter>\r
+    </None>\r
+  </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