OSDN Git Service

(root) / winmerge-jp / winmerge-jp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 61bcecb)
some tweaks
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sat, 13 Apr 2019 01:10:44 +0000 (10:10 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sat, 13 Apr 2019 01:10:44 +0000 (10:10 +0900)
Src/Common/LanguageSelect.cpp patch | blob | history
Src/Common/ShellContextMenu.cpp patch | blob | history
Src/Common/ShellContextMenu.h patch | blob | history
Src/Common/VersionInfo.cpp patch | blob | history
Src/Common/VersionInfo.h patch | blob | history
Src/Merge.vs2017.vcxproj patch | blob | history
Src/Merge.vs2017.vcxproj.filters patch | blob | history
Src/Merge.vs2019.vcxproj patch | blob | history
Src/Merge.vs2019.vcxproj.filters patch | blob | history

diff --git a/Src/Common/LanguageSelect.cpp b/Src/Common/LanguageSelect.cpp
index 76fa9df..d8eba8e 100644 (file)
--- a/Src/Common/LanguageSelect.cpp
+++ b/Src/Common/LanguageSelect.cpp
@@ -6,7 +6,6 @@
 
 #include "StdAfx.h"
 #include "LanguageSelect.h"
-#include "VersionInfo.h"
 #include "BCMenu.h"
 #include "Environment.h"
 #include "paths.h"
diff --git a/Src/Common/ShellContextMenu.cpp b/Src/Common/ShellContextMenu.cpp
index 4512579..df8b1b7 100644 (file)
--- a/Src/Common/ShellContextMenu.cpp
+++ b/Src/Common/ShellContextMenu.cpp
@@ -24,7 +24,7 @@
  * @brief Main implementation file for CShellContextMenu
  */
 
-#include "StdAfx.h"
+#include "pch.h"
 #include "ShellContextMenu.h"
 #include "PidlContainer.h"
 
@@ -147,7 +147,7 @@ bool CShellContextMenu::QueryShellContextMenu()
                        LPITEMIDLIST dirPidl;
                        if (FAILED(/*hr = */pDesktop->ParseDisplayName(nullptr,                            // hwnd
                                                                                                           nullptr,                                        // pbc
-                                                                                                          CT2OLE(currentDir.c_str()), // pszDisplayName
+                                                                                                          const_cast<wchar_t *>(currentDir.c_str()),   // pszDisplayName
                                                                                                           nullptr,                                        // pchEaten
                                                                                                           &dirPidl,                               // ppidl
                                                                                                           nullptr                                         // pdwAttributes
@@ -172,7 +172,7 @@ bool CShellContextMenu::QueryShellContextMenu()
                LPITEMIDLIST pidl;
                if (FAILED(/*hr = */pCurrFolder->ParseDisplayName(nullptr,
                                                                                                          nullptr,
-                                                                                                         CT2OLE(file.filename.c_str()), 
+                                                                                                         const_cast<wchar_t *>(file.filename.c_str()), 
                                                                                                          nullptr,
                                                                                                          &pidl,
                                                                                                          nullptr)))
@@ -213,7 +213,7 @@ bool CShellContextMenu::QueryShellContextMenu()
                m_pPreferredMenu = pCMenu3;
        }
 
-       ASSERT(::IsMenu(m_hShellContextMenu));
+       assert(::IsMenu(m_hShellContextMenu));
        if (FAILED(/*hr = */m_pPreferredMenu->QueryContextMenu(m_hShellContextMenu,
                                                                                                           0,
                                                                                                           m_cmdFirst,
@@ -241,7 +241,7 @@ bool CShellContextMenu::InvokeCommand(UINT nCmd, HWND hWnd)
                ici.nShow = SW_SHOWNORMAL;
 
                HRESULT hr = m_pPreferredMenu->InvokeCommand(&ici);
-               ASSERT(SUCCEEDED(hr));
+               assert(SUCCEEDED(hr));
                return SUCCEEDED(hr);
        }
        else 
@@ -252,12 +252,12 @@ bool CShellContextMenu::InvokeCommand(UINT nCmd, HWND hWnd)
 
 bool CShellContextMenu::RequeryShellContextMenu()
 {
-       ASSERT(::IsMenu(m_hShellContextMenu));
+       assert(::IsMenu(m_hShellContextMenu));
        while (::GetMenuItemCount(m_hShellContextMenu) > 0)
        {
                ::DeleteMenu(m_hShellContextMenu, 0, MF_BYPOSITION);
        }
-       ASSERT(::GetMenuItemCount(m_hShellContextMenu) == 0);
+       assert(::GetMenuItemCount(m_hShellContextMenu) == 0);
 
        return QueryShellContextMenu();
 }
diff --git a/Src/Common/ShellContextMenu.h b/Src/Common/ShellContextMenu.h
index 8f479fb..eb8338a 100644 (file)
--- a/Src/Common/ShellContextMenu.h
+++ b/Src/Common/ShellContextMenu.h
@@ -24,11 +24,11 @@
  */ 
 #pragma once
 
-#include <comdef.h>
 #pragma warning (push)                 // prevent "warning C4091: 'typedef ': ignored on left of 'tagGPFIDL_FLAGS' when no variable is declared"
 #pragma warning (disable:4091) // VC bug when using XP enabled toolsets.
 #include <shlobj.h>
 #pragma warning (pop)
+#include <comdef.h>
 #include <list>
 #include "UnicodeString.h"
 
diff --git a/Src/Common/VersionInfo.cpp b/Src/Common/VersionInfo.cpp
index 7b667be..80d9f8d 100644 (file)
--- a/Src/Common/VersionInfo.cpp
+++ b/Src/Common/VersionInfo.cpp
@@ -1,5 +1,5 @@
 /**
- *  @file version.cpp
+ *  @file VersionInfo.cpp
  *
  *  @brief Implementation of CVersionInfo class
  */ 
@@ -8,11 +8,9 @@
 #include "VersionInfo.h"
 #include <windows.h>
 #include <cstdio>
-#include <tchar.h>
 #include <cassert>
 #include <strsafe.h>
 #include "UnicodeString.h"
-#include "TFile.h"
 
 /** 
  * @brief Structure used to store language and codepage.
diff --git a/Src/Common/VersionInfo.h b/Src/Common/VersionInfo.h
index e62b395..6fe003c 100644 (file)
--- a/Src/Common/VersionInfo.h
+++ b/Src/Common/VersionInfo.h
@@ -1,5 +1,5 @@
 /**
- *  @file version.h
+ *  @file VersionInfo.h
  *
  *  @brief Declaration of CVersionInfo class
  */ 
diff --git a/Src/Merge.vs2017.vcxproj b/Src/Merge.vs2017.vcxproj
index 6321bcd..cf017e6 100644 (file)
--- a/Src/Merge.vs2017.vcxproj
+++ b/Src/Merge.vs2017.vcxproj
@@ -939,7 +939,11 @@
     <ClCompile Include="Common\scbarg.cpp" />\r
     <ClCompile Include="SelectUnpackerDlg.cpp" />\r
     <ClCompile Include="SharedFilterDlg.cpp" />\r
-    <ClCompile Include="Common\ShellContextMenu.cpp" />\r
+    <ClCompile Include="Common\ShellContextMenu.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
     <ClCompile Include="Common\ShellFileOperations.cpp">\r
       <PrecompiledHeader>Use</PrecompiledHeader>\r
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
diff --git a/Src/Merge.vs2017.vcxproj.filters b/Src/Merge.vs2017.vcxproj.filters
index b83b5ff..e2ac702 100644 (file)
--- a/Src/Merge.vs2017.vcxproj.filters
+++ b/Src/Merge.vs2017.vcxproj.filters
@@ -23,9 +23,6 @@
       <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
@@ -38,9 +35,6 @@
     <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
@@ -62,6 +56,57 @@
     <Filter Include="MergeTest\gtest">\r
       <UniqueIdentifier>{67c954df-e54f-4070-9c75-68ef52a00e03}</UniqueIdentifier>\r
     </Filter>\r
+    <Filter Include="MFCGui\Common\Header Files">\r
+      <UniqueIdentifier>{30ca9a5d-4b26-4d57-b39b-f7fe3e7c7abc}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\Common\Source Files">\r
+      <UniqueIdentifier>{567b3ec4-d358-4290-8a27-4e87c11cfb55}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\Dialogs\Source Files">\r
+      <UniqueIdentifier>{befda2e3-2f20-4080-89b1-803c6935bf05}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\Dialogs\Header Files">\r
+      <UniqueIdentifier>{a988a22b-3d18-4d67-bf3e-8912bf9940f2}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\PropertyPages">\r
+      <UniqueIdentifier>{c6b39fdf-7c68-42c3-895b-da25bb6e51b4}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\PropertyPages\Source Files">\r
+      <UniqueIdentifier>{bc0e280a-2589-4e45-883e-1eb0db655c07}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\PropertyPages\Header Files">\r
+      <UniqueIdentifier>{313fa20e-cf17-46e5-8ebf-c16b07786225}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="Common">\r
+      <UniqueIdentifier>{9545a3ff-6867-464f-a244-755ed58529e0}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="Common\Header Files">\r
+      <UniqueIdentifier>{cef4b0e0-5b0d-4f4f-8522-fe6eb66f3fa5}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="Common\Source Files">\r
+      <UniqueIdentifier>{ae04066b-7462-4a9b-8120-6d72fa5fe73e}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="EditLib\Source Files">\r
+      <UniqueIdentifier>{7ebea8c0-3335-4e4d-b56f-222e5c5b700a}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="EditLib\Header Files">\r
+      <UniqueIdentifier>{295aa90c-8c94-400a-a4e3-84cac2b447f0}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="EditLib\Parsers">\r
+      <UniqueIdentifier>{740d4dd9-ab31-47b8-9cbb-8e6a7b5db4fe}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="EditLib\Parsers\Source Files">\r
+      <UniqueIdentifier>{dcc78107-52dc-43d1-b4f7-7acf8c71fce4}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="EditLib\Parsers\Header Files">\r
+      <UniqueIdentifier>{1de6d090-09d8-423e-9a39-92e523334e4e}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="Compare Engines\Source Files">\r
+      <UniqueIdentifier>{e80d7ff2-f4b2-4c37-8db5-e26835cd90cf}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="Compare Engines\Header Files">\r
+      <UniqueIdentifier>{e0f6e1ca-9725-4a97-81da-adf12e7a4e42}</UniqueIdentifier>\r
+    </Filter>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClCompile Include="charsets.c">\r
@@ -82,9 +127,6 @@
     <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
@@ -157,9 +199,6 @@
     <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
@@ -172,15 +211,9 @@
     <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
@@ -190,9 +223,6 @@
     <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
@@ -202,36 +232,15 @@
     <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
@@ -265,195 +274,12 @@
     <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="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
@@ -538,12 +364,6 @@
     <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
@@ -559,233 +379,458 @@
     <ClCompile Include="OptionsDiffOptions.cpp">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="PropArchive.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClCompile Include="PatchTool.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="PropBackups.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClCompile Include="JumpList.cpp">\r
+      <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="PropCodepage.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClCompile Include="OptionsCustomColors.cpp">\r
+      <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="PropColors.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClCompile Include="ImgMergeFrm.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="PropCompare.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClCompile Include="Merge7zFormatMergePluginImpl.cpp">\r
+      <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="PropCompareFolder.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClCompile Include="LineFiltersList.cpp">\r
+      <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="PropEditor.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClCompile Include="DirViewColItems.cpp">\r
+      <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="PropGeneral.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClCompile Include="DirActions.cpp">\r
+      <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="PropRegistry.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClCompile Include="DropHandler.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="PropShell.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClCompile Include="OptionsDef.cpp">\r
+      <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="PropSyntaxColors.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClCompile Include="TrDialogs.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="PropTextColors.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClCompile Include="MergeStatusBar.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="AboutDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+    <ClCompile Include="diffutils\src\mystat.cpp">\r
+      <Filter>GNU diffutils</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="DirCmpReportDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+    <ClCompile Include="MergeEditSplitterView.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="DirColsDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+    <ClCompile Include="Test.cpp">\r
+      <Filter>MergeTest</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="LineFiltersDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+    <ClCompile Include="TestMain.cpp">\r
+      <Filter>MergeTest</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="LoadSaveCodepageDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+    <ClCompile Include="..\Externals\gtest\src\gtest-all.cc">\r
+      <Filter>MergeTest\gtest</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="PatchDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+    <ClCompile Include="Merge7zFormatShellImpl.cpp">\r
+      <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="PluginsListDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+    <ClCompile Include="pch.cpp">\r
+      <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="SaveClosingDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+    <ClCompile Include="OptionsPanel.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="SelectUnpackerDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+    <ClCompile Include="MergeEditFrm.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="SharedFilterDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+    <ClCompile Include="Common\BCMenu.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="TestFilterDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+    <ClCompile Include="Common\Bitmap.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="WMGotoDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+    <ClCompile Include="Common\CMoveConstraint.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="FileFiltersDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+    <ClCompile Include="Common\ColorButton.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\LanguageSelect.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\MDITabBar.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\MessageBoxDialog.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\Picture.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\PropertyPageHost.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\scbarcf.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\scbarg.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\sizecbar.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\SortHeaderCtrl.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\SplitterWndEx.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\SuperComboBox.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="AboutDlg.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
     </ClCompile>\r
     <ClCompile Include="CompareStatisticsDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
     </ClCompile>\r
     <ClCompile Include="ConfirmFolderCopyDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="PatchTool.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
+    <ClCompile Include="DirCmpReportDlg.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="Common\SortHeaderCtrl.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
+    <ClCompile Include="DirColsDlg.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="FileFiltersDlg.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="LineFiltersDlg.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="LoadSaveCodepageDlg.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PatchDlg.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PluginsListDlg.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
     </ClCompile>\r
     <ClCompile Include="Common\PreferencesDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="JumpList.cpp">\r
-      <Filter>Source Files</Filter>\r
+    <ClCompile Include="SaveClosingDlg.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="Common\ClipBoard.cpp">\r
-      <Filter>Source Files</Filter>\r
+    <ClCompile Include="SelectUnpackerDlg.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="OptionsCustomColors.cpp">\r
-      <Filter>Source Files</Filter>\r
+    <ClCompile Include="SharedFilterDlg.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="ImgMergeFrm.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
+    <ClCompile Include="TestFilterDlg.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="PropCompareImage.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClCompile Include="WMGotoDlg.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="Merge7zFormatMergePluginImpl.cpp">\r
-      <Filter>Source Files</Filter>\r
+    <ClCompile Include="PropArchive.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="LineFiltersList.cpp">\r
-      <Filter>Source Files</Filter>\r
+    <ClCompile Include="PropBackups.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="CompareEngines\BinaryCompare.cpp">\r
-      <Filter>Compare Engines</Filter>\r
+    <ClCompile Include="PropCodepage.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropColors.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropCompare.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
     </ClCompile>\r
     <ClCompile Include="PropCompareBinary.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="DirViewColItems.cpp">\r
-      <Filter>Source Files</Filter>\r
+    <ClCompile Include="PropCompareFolder.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="DirActions.cpp">\r
-      <Filter>Source Files</Filter>\r
+    <ClCompile Include="PropCompareImage.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="DropHandler.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
+    <ClCompile Include="PropEditor.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="OptionsDef.cpp">\r
-      <Filter>Source Files</Filter>\r
+    <ClCompile Include="PropGeneral.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="Common\scbarg.cpp">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClCompile Include="PropMarkerColors.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="Common\scbarcf.cpp">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClCompile Include="PropRegistry.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="Common\sizecbar.cpp">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClCompile Include="PropShell.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="Common\BCMenu.cpp">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClCompile Include="PropSyntaxColors.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="Common\MDITabBar.cpp">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClCompile Include="PropTextColors.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="Common\MessageBoxDialog.cpp">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClCompile Include="Common\ClipBoard.cpp">\r
+      <Filter>Common\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="Common\SuperComboBox.cpp">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClCompile Include="Common\coretools.cpp">\r
+      <Filter>Common\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="Common\SplitterWndEx.cpp">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClCompile Include="Common\lwdisp.c">\r
+      <Filter>Common\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="Common\Bitmap.cpp">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClCompile Include="Common\RegKey.cpp">\r
+      <Filter>Common\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="Common\Picture.cpp">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClCompile Include="Common\ShellFileOperations.cpp">\r
+      <Filter>Common\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="Common\ShellContextMenu.cpp">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClCompile Include="Common\UniFile.cpp">\r
+      <Filter>Common\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="Common\PropertyPageHost.cpp">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClCompile Include="Common\UnicodeString.cpp">\r
+      <Filter>Common\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="TrDialogs.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
+    <ClCompile Include="Common\unicoder.cpp">\r
+      <Filter>Common\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="MergeStatusBar.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
+    <ClCompile Include="Common\RegOptionsMgr.cpp">\r
+      <Filter>Common\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="diffutils\src\mystat.cpp">\r
-      <Filter>GNU diffutils</Filter>\r
+    <ClCompile Include="Common\PidlContainer.cpp">\r
+      <Filter>Common\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\go.cpp">\r
-      <Filter>EditLib\parsers</Filter>\r
+    <ClCompile Include="common\OptionsMgr.cpp">\r
+      <Filter>Common\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\rust.cpp">\r
-      <Filter>EditLib\parsers</Filter>\r
+    <ClCompile Include="Common\multiformatText.cpp">\r
+      <Filter>Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\ExConverter.cpp">\r
+      <Filter>Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\varprop.cpp">\r
+      <Filter>Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaleditview.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
     </ClCompile>\r
     <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.cpp">\r
-      <Filter>EditLib</Filter>\r
+      <Filter>EditLib\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview2.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ceditreplacedlg.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\cfindtextdlg.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\chcondlg.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\cregexp_poco.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\crystaleditviewex.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\crystalparser.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\crystaltextblock.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\cs2cs.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
     </ClCompile>\r
     <ClCompile Include="..\Externals\crystaledit\editlib\ctextmarkerdlg.cpp">\r
-      <Filter>EditLib</Filter>\r
+      <Filter>EditLib\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="PropMarkerColors.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\filesup.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="Common\VersionInfo.cpp">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\fpattern.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="MergeEditSplitterView.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\gotodlg.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="CompareEngines\Wrap_DiffUtils.cpp">\r
-      <Filter>Compare Engines</Filter>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\LineInfo.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="Test.cpp">\r
-      <Filter>MergeTest</Filter>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\memcombo.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="TestMain.cpp">\r
-      <Filter>MergeTest</Filter>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\registry.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\Externals\gtest\src\gtest-all.cc">\r
-      <Filter>MergeTest\gtest</Filter>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\statbar.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="Merge7zFormatShellImpl.cpp">\r
-      <Filter>Source Files</Filter>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\string_util.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\SyntaxColors.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\UndoRecord.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ViewableWhitespace.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
     </ClCompile>\r
     <ClCompile Include="..\Externals\crystaledit\editlib\wcwidth.cpp">\r
-      <Filter>EditLib</Filter>\r
+      <Filter>EditLib\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="pch.cpp">\r
-      <Filter>Source Files</Filter>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\asp.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="OptionsPanel.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\basic.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\plain.cpp">\r
-      <Filter>EditLib\parsers</Filter>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\batch.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\cplusplus.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\csharp.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\css.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\dcl.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\fortran.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\go.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\html.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ini.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\innosetup.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\is.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\java.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\lisp.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
     </ClCompile>\r
     <ClCompile Include="..\Externals\crystaledit\editlib\lua.cpp">\r
-      <Filter>EditLib\parsers</Filter>\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="MergeEditFrm.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\nsis.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\pascal.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\perl.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\php.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\plain.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\po.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\powershell.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\python.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\rexx.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\rsrc.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ruby.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\rust.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\sgml.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\sh.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\siod.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\sql.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\tcl.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\tex.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\verilog.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\vhdl.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\xml.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareEngines\BinaryCompare.cpp">\r
+      <Filter>Compare Engines\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareEngines\ByteComparator.cpp">\r
+      <Filter>Compare Engines\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareEngines\ByteCompare.cpp">\r
+      <Filter>Compare Engines\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareEngines\TimeSizeCompare.cpp">\r
+      <Filter>Compare Engines\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareEngines\Wrap_DiffUtils.cpp">\r
+      <Filter>Compare Engines\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\VersionInfo.cpp">\r
+      <Filter>Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\ShellContextMenu.cpp">\r
+      <Filter>Common\Source Files</Filter>\r
     </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
@@ -807,9 +852,6 @@
     <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
@@ -906,9 +948,6 @@
     <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
@@ -918,15 +957,9 @@
     <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
@@ -936,9 +969,6 @@
     <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
@@ -948,15 +978,6 @@
     <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
@@ -966,21 +987,9 @@
     <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
@@ -993,93 +1002,6 @@
     <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
@@ -1146,311 +1068,434 @@
     <ClInclude Include="DirDoc.h">\r
       <Filter>MFCGui\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="DirFrame.h">\r
+    <ClInclude Include="DirFrame.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DirView.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="EditorFilepathBar.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="EncodingErrorBar.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="FileActionScript.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="FilepathEdit.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="IListCtrlImpl.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="MergeLineFlags.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="MergeApp.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DirCompProgressBar.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Diff3.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="OptionsFont.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="OptionsSyntaxColors.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="OptionsDiffColors.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="OptionsDiffOptions.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PatchTool.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="JumpList.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="OptionsCustomColors.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="7zCommon.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="ImgMergeFrm.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="IMergeDoc.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Merge7zFormatMergePluginImpl.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Merge7zFormatRegister.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DirViewColItems.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DirActions.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="HexMergeView.h">\r
       <Filter>MFCGui\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="DirView.h">\r
+    <ClInclude Include="OptionsPanel.h">\r
       <Filter>MFCGui\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="EditorFilepathBar.h">\r
+    <ClInclude Include="DropHandler.h">\r
       <Filter>MFCGui\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="EncodingErrorBar.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
+    <ClInclude Include="Constants.h">\r
+      <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="FileActionScript.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
+    <ClInclude Include="OptionsInit.h">\r
+      <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="FilepathEdit.h">\r
+    <ClInclude Include="TrDialogs.h">\r
       <Filter>MFCGui\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Common\LanguageSelect.h">\r
+    <ClInclude Include="MergeStatusBar.h">\r
       <Filter>MFCGui\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="IListCtrlImpl.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
+    <ClInclude Include="..\Externals\boost\boost\config.hpp">\r
+      <Filter>Boost</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="MergeLineFlags.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
+    <ClInclude Include="..\Externals\boost\boost\config\compiler\visualc.hpp">\r
+      <Filter>Boost\config\compiler</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="MergeApp.h">\r
-      <Filter>Header Files</Filter>\r
+    <ClInclude Include="..\Externals\boost\boost\config\select_compiler_config.hpp">\r
+      <Filter>Boost\config</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Common\ExConverter.h">\r
+    <ClInclude Include="..\Version.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="DirCompProgressBar.h">\r
+    <ClInclude Include="MergeEditSplitterView.h">\r
       <Filter>MFCGui\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Diff3.h">\r
-      <Filter>Header Files</Filter>\r
+    <ClInclude Include="TestMain.h">\r
+      <Filter>MergeTest</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="OptionsFont.h">\r
+    <ClInclude Include="Win_VersionHelper.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="OptionsSyntaxColors.h">\r
-      <Filter>Header Files</Filter>\r
+    <ClInclude Include="..\Externals\gtest\include\gtest\gtest.h">\r
+      <Filter>MergeTest\gtest</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="OptionsDiffColors.h">\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="OptionsDiffOptions.h">\r
+    <ClInclude Include="pch.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="PropArchive.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClInclude Include="MergeEditFrm.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="PropBackups.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClInclude Include="Common\BCMenu.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="PropCodepage.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClInclude Include="Common\Bitmap.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="PropColors.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClInclude Include="Common\CMoveConstraint.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="PropCompare.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClInclude Include="Common\ColorButton.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="PropCompareFolder.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClInclude Include="Common\LanguageSelect.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="PropEditor.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClInclude Include="Common\MDITabBar.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="PropGeneral.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClInclude Include="Common\memdc.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="PropRegistry.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClInclude Include="Common\MessageBoxDialog.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="PropShell.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClInclude Include="Common\Picture.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="PropSyntaxColors.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClInclude Include="Common\scbarcf.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="PropTextColors.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClInclude Include="Common\PropertyPageHost.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\scbarg.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\sizecbar.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\SortHeaderCtrl.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\SplitterWndEx.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\SuperComboBox.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
     </ClInclude>\r
     <ClInclude Include="AboutDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
     </ClInclude>\r
     <ClInclude Include="CompareStatisticsDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
     </ClInclude>\r
     <ClInclude Include="ConfirmFolderCopyDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
     </ClInclude>\r
     <ClInclude Include="DirCmpReportDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="FileFiltersDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+    <ClInclude Include="DirColsDlg.h">\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="LoadSaveCodepageDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+    <ClInclude Include="FileFiltersDlg.h">\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
     </ClInclude>\r
     <ClInclude Include="LineFiltersDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="LoadSaveCodepageDlg.h">\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
     </ClInclude>\r
     <ClInclude Include="PatchDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
     </ClInclude>\r
     <ClInclude Include="PluginsListDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\PreferencesDlg.h">\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
     </ClInclude>\r
     <ClInclude Include="SaveClosingDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
     </ClInclude>\r
     <ClInclude Include="SelectUnpackerDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
     </ClInclude>\r
     <ClInclude Include="SharedFilterDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
     </ClInclude>\r
     <ClInclude Include="TestFilterDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+      <Filter>MFCGui\Dialogs\Header Files</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
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="PatchTool.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
+    <ClInclude Include="PropArchive.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Common\PreferencesDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+    <ClInclude Include="PropBackups.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="JumpList.h">\r
-      <Filter>Header Files</Filter>\r
+    <ClInclude Include="PropCodepage.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Common\ClipBoard.h">\r
-      <Filter>Header Files</Filter>\r
+    <ClInclude Include="PropColors.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="OptionsCustomColors.h">\r
-      <Filter>Header Files</Filter>\r
+    <ClInclude Include="PropCompare.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="7zCommon.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
+    <ClInclude Include="PropCompareBinary.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="ImgMergeFrm.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
+    <ClInclude Include="PropCompareFolder.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
     </ClInclude>\r
     <ClInclude Include="PropCompareImage.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="IMergeDoc.h">\r
-      <Filter>Header Files</Filter>\r
+    <ClInclude Include="PropEditor.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Merge7zFormatMergePluginImpl.h">\r
-      <Filter>Header Files</Filter>\r
+    <ClInclude Include="PropGeneral.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Merge7zFormatRegister.h">\r
-      <Filter>Header Files</Filter>\r
+    <ClInclude Include="PropMarkerColors.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="CompareEngines\BinaryCompare.h">\r
-      <Filter>Compare Engines</Filter>\r
+    <ClInclude Include="PropRegistry.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="DirViewColItems.h">\r
-      <Filter>Header Files</Filter>\r
+    <ClInclude Include="PropShell.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="DirActions.h">\r
-      <Filter>Header Files</Filter>\r
+    <ClInclude Include="PropSyntaxColors.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="HexMergeView.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
+    <ClInclude Include="PropTextColors.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="PropCompareBinary.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClInclude Include="Common\ClipBoard.h">\r
+      <Filter>Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Common\SuperComboBox.h">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClInclude Include="Common\coretools.h">\r
+      <Filter>Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Common\SortHeaderCtrl.h">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClInclude Include="Common\lwdisp.h">\r
+      <Filter>Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Common\CMoveConstraint.h">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClInclude Include="Common\ExConverter.h">\r
+      <Filter>Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Common\MDITabBar.h">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClInclude Include="Common\UniFile.h">\r
+      <Filter>Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Common\PropertyPageHost.h">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClInclude Include="Common\UnicodeString.h">\r
+      <Filter>Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Common\SplitterWndEx.h">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClInclude Include="Common\unicoder.h">\r
+      <Filter>Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Common\sizecbar.h">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClInclude Include="Common\ShellFileOperations.h">\r
+      <Filter>Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Common\scbarg.h">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClInclude Include="Common\RegOptionsMgr.h">\r
+      <Filter>Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Common\scbarcf.h">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClInclude Include="Common\RegKey.h">\r
+      <Filter>Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Common\MessageBoxDialog.h">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClInclude Include="Common\PidlContainer.h">\r
+      <Filter>Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="OptionsPanel.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
+    <ClInclude Include="common\OptionsMgr.h">\r
+      <Filter>Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Common\Bitmap.h">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClInclude Include="Common\varprop.h">\r
+      <Filter>Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Common\memdc.h">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClInclude Include="Common\multiformatText.h">\r
+      <Filter>Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Common\ShellContextMenu.h">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaleditview.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Common\BCMenu.h">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Common\ColorButton.h">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Common\Picture.h">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextview.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="DropHandler.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\ceditreplacedlg.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Constants.h">\r
-      <Filter>Header Files</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\cfindtextdlg.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="OptionsInit.h">\r
-      <Filter>Header Files</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\cregexp.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="TrDialogs.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\chcondlg.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="MergeStatusBar.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\crystaleditviewex.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.h">\r
-      <Filter>EditLib</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\crystalparser.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="PropMarkerColors.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\crystaltextblock.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\cs2cs.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
     <ClInclude Include="..\Externals\crystaledit\editlib\ctextmarkerdlg.h">\r
-      <Filter>EditLib</Filter>\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\Externals\boost\boost\config.hpp">\r
-      <Filter>Boost</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\editreg.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\Externals\boost\boost\config\compiler\visualc.hpp">\r
-      <Filter>Boost\config\compiler</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\editcmd.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\Externals\boost\boost\config\select_compiler_config.hpp">\r
-      <Filter>Boost\config</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\edtlib.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\Version.h">\r
-      <Filter>Header Files</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\filesup.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Common\VersionInfo.h">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\fpattern.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="MergeEditSplitterView.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\gotodlg.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="CompareEngines\Wrap_DiffUtils.h">\r
-      <Filter>Compare Engines</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\LineInfo.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="TestMain.h">\r
-      <Filter>MergeTest</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\memcombo.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Win_VersionHelper.h">\r
-      <Filter>Header Files</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\registry.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\Externals\gtest\include\gtest\gtest.h">\r
-      <Filter>MergeTest\gtest</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\statbar.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\Externals\gtest\include\gtest\gtest-printers.h">\r
-      <Filter>MergeTest\gtest</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\string_util.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\Externals\gtest\include\gtest\internal\gtest-port.h">\r
-      <Filter>MergeTest\gtest</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\SyntaxColors.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Merge7zFormatShellImpl.h">\r
-      <Filter>Header Files</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\UndoRecord.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\ViewableWhitespace.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
     <ClInclude Include="..\Externals\crystaledit\editlib\wcwidth.h">\r
-      <Filter>EditLib</Filter>\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="pch.h">\r
-      <Filter>Header Files</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\wispelld.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
     <ClInclude Include="..\Externals\crystaledit\editlib\crystallineparser.h">\r
-      <Filter>EditLib\parsers</Filter>\r
+      <Filter>EditLib\Parsers\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="MergeEditFrm.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
+    <ClInclude Include="CompareEngines\BinaryCompare.h">\r
+      <Filter>Compare Engines\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="CompareEngines\ByteComparator.h">\r
+      <Filter>Compare Engines\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="CompareEngines\ByteCompare.h">\r
+      <Filter>Compare Engines\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="CompareEngines\TimeSizeCompare.h">\r
+      <Filter>Compare Engines\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="CompareEngines\Wrap_DiffUtils.h">\r
+      <Filter>Compare Engines\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\VersionInfo.h">\r
+      <Filter>Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\ShellContextMenu.h">\r
+      <Filter>Common\Header Files</Filter>\r
     </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
@@ -1562,4 +1607,4 @@
       <Filter>Resource Files</Filter>\r
     </ResourceCompile>\r
   </ItemGroup>\r
-</Project>\r
+</Project>
\ No newline at end of file
diff --git a/Src/Merge.vs2019.vcxproj b/Src/Merge.vs2019.vcxproj
index 8a2a916..1ea3485 100644 (file)
--- a/Src/Merge.vs2019.vcxproj
+++ b/Src/Merge.vs2019.vcxproj
@@ -219,7 +219,6 @@
       <SDLCheck>true</SDLCheck>\r
       <LanguageStandard>stdcpp17</LanguageStandard>\r
       <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>\r
-      <AssemblerOutput>All</AssemblerOutput>\r
     </ClCompile>\r
     <ResourceCompile>\r
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
@@ -939,7 +938,11 @@
     <ClCompile Include="Common\scbarg.cpp" />\r
     <ClCompile Include="SelectUnpackerDlg.cpp" />\r
     <ClCompile Include="SharedFilterDlg.cpp" />\r
-    <ClCompile Include="Common\ShellContextMenu.cpp" />\r
+    <ClCompile Include="Common\ShellContextMenu.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
     <ClCompile Include="Common\ShellFileOperations.cpp">\r
       <PrecompiledHeader>Use</PrecompiledHeader>\r
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
diff --git a/Src/Merge.vs2019.vcxproj.filters b/Src/Merge.vs2019.vcxproj.filters
index fcb4de1..e2ac702 100644 (file)
--- a/Src/Merge.vs2019.vcxproj.filters
+++ b/Src/Merge.vs2019.vcxproj.filters
@@ -23,9 +23,6 @@
       <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
@@ -38,9 +35,6 @@
     <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
@@ -62,6 +56,57 @@
     <Filter Include="MergeTest\gtest">\r
       <UniqueIdentifier>{67c954df-e54f-4070-9c75-68ef52a00e03}</UniqueIdentifier>\r
     </Filter>\r
+    <Filter Include="MFCGui\Common\Header Files">\r
+      <UniqueIdentifier>{30ca9a5d-4b26-4d57-b39b-f7fe3e7c7abc}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\Common\Source Files">\r
+      <UniqueIdentifier>{567b3ec4-d358-4290-8a27-4e87c11cfb55}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\Dialogs\Source Files">\r
+      <UniqueIdentifier>{befda2e3-2f20-4080-89b1-803c6935bf05}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\Dialogs\Header Files">\r
+      <UniqueIdentifier>{a988a22b-3d18-4d67-bf3e-8912bf9940f2}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\PropertyPages">\r
+      <UniqueIdentifier>{c6b39fdf-7c68-42c3-895b-da25bb6e51b4}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\PropertyPages\Source Files">\r
+      <UniqueIdentifier>{bc0e280a-2589-4e45-883e-1eb0db655c07}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\PropertyPages\Header Files">\r
+      <UniqueIdentifier>{313fa20e-cf17-46e5-8ebf-c16b07786225}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="Common">\r
+      <UniqueIdentifier>{9545a3ff-6867-464f-a244-755ed58529e0}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="Common\Header Files">\r
+      <UniqueIdentifier>{cef4b0e0-5b0d-4f4f-8522-fe6eb66f3fa5}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="Common\Source Files">\r
+      <UniqueIdentifier>{ae04066b-7462-4a9b-8120-6d72fa5fe73e}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="EditLib\Source Files">\r
+      <UniqueIdentifier>{7ebea8c0-3335-4e4d-b56f-222e5c5b700a}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="EditLib\Header Files">\r
+      <UniqueIdentifier>{295aa90c-8c94-400a-a4e3-84cac2b447f0}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="EditLib\Parsers">\r
+      <UniqueIdentifier>{740d4dd9-ab31-47b8-9cbb-8e6a7b5db4fe}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="EditLib\Parsers\Source Files">\r
+      <UniqueIdentifier>{dcc78107-52dc-43d1-b4f7-7acf8c71fce4}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="EditLib\Parsers\Header Files">\r
+      <UniqueIdentifier>{1de6d090-09d8-423e-9a39-92e523334e4e}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="Compare Engines\Source Files">\r
+      <UniqueIdentifier>{e80d7ff2-f4b2-4c37-8db5-e26835cd90cf}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="Compare Engines\Header Files">\r
+      <UniqueIdentifier>{e0f6e1ca-9725-4a97-81da-adf12e7a4e42}</UniqueIdentifier>\r
+    </Filter>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClCompile Include="charsets.c">\r
@@ -82,9 +127,6 @@
     <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
@@ -157,9 +199,6 @@
     <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
@@ -172,15 +211,9 @@
     <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
@@ -190,9 +223,6 @@
     <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
@@ -202,36 +232,15 @@
     <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
@@ -265,195 +274,12 @@
     <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="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
@@ -538,12 +364,6 @@
     <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
@@ -559,233 +379,458 @@
     <ClCompile Include="OptionsDiffOptions.cpp">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="PropArchive.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClCompile Include="PatchTool.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="PropBackups.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClCompile Include="JumpList.cpp">\r
+      <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="PropCodepage.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClCompile Include="OptionsCustomColors.cpp">\r
+      <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="PropColors.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClCompile Include="ImgMergeFrm.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="PropCompare.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClCompile Include="Merge7zFormatMergePluginImpl.cpp">\r
+      <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="PropCompareFolder.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClCompile Include="LineFiltersList.cpp">\r
+      <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="PropEditor.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClCompile Include="DirViewColItems.cpp">\r
+      <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="PropGeneral.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClCompile Include="DirActions.cpp">\r
+      <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="PropRegistry.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClCompile Include="DropHandler.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="PropShell.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClCompile Include="OptionsDef.cpp">\r
+      <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="PropSyntaxColors.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClCompile Include="TrDialogs.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="PropTextColors.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClCompile Include="MergeStatusBar.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="AboutDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+    <ClCompile Include="diffutils\src\mystat.cpp">\r
+      <Filter>GNU diffutils</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="DirCmpReportDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+    <ClCompile Include="MergeEditSplitterView.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="DirColsDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+    <ClCompile Include="Test.cpp">\r
+      <Filter>MergeTest</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="LineFiltersDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+    <ClCompile Include="TestMain.cpp">\r
+      <Filter>MergeTest</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="LoadSaveCodepageDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+    <ClCompile Include="..\Externals\gtest\src\gtest-all.cc">\r
+      <Filter>MergeTest\gtest</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="PatchDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+    <ClCompile Include="Merge7zFormatShellImpl.cpp">\r
+      <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="PluginsListDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+    <ClCompile Include="pch.cpp">\r
+      <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="SaveClosingDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+    <ClCompile Include="OptionsPanel.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="SelectUnpackerDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+    <ClCompile Include="MergeEditFrm.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="SharedFilterDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+    <ClCompile Include="Common\BCMenu.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="TestFilterDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+    <ClCompile Include="Common\Bitmap.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="WMGotoDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+    <ClCompile Include="Common\CMoveConstraint.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="FileFiltersDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+    <ClCompile Include="Common\ColorButton.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\LanguageSelect.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\MDITabBar.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\MessageBoxDialog.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\Picture.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\PropertyPageHost.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\scbarcf.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\scbarg.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\sizecbar.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\SortHeaderCtrl.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\SplitterWndEx.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\SuperComboBox.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="AboutDlg.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
     </ClCompile>\r
     <ClCompile Include="CompareStatisticsDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
     </ClCompile>\r
     <ClCompile Include="ConfirmFolderCopyDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="PatchTool.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
+    <ClCompile Include="DirCmpReportDlg.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="Common\SortHeaderCtrl.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
+    <ClCompile Include="DirColsDlg.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="FileFiltersDlg.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="LineFiltersDlg.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="LoadSaveCodepageDlg.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PatchDlg.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PluginsListDlg.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
     </ClCompile>\r
     <ClCompile Include="Common\PreferencesDlg.cpp">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="JumpList.cpp">\r
-      <Filter>Source Files</Filter>\r
+    <ClCompile Include="SaveClosingDlg.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="Common\ClipBoard.cpp">\r
-      <Filter>Source Files</Filter>\r
+    <ClCompile Include="SelectUnpackerDlg.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="OptionsCustomColors.cpp">\r
-      <Filter>Source Files</Filter>\r
+    <ClCompile Include="SharedFilterDlg.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="ImgMergeFrm.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
+    <ClCompile Include="TestFilterDlg.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="PropCompareImage.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClCompile Include="WMGotoDlg.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="Merge7zFormatMergePluginImpl.cpp">\r
-      <Filter>Source Files</Filter>\r
+    <ClCompile Include="PropArchive.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="LineFiltersList.cpp">\r
-      <Filter>Source Files</Filter>\r
+    <ClCompile Include="PropBackups.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="CompareEngines\BinaryCompare.cpp">\r
-      <Filter>Compare Engines</Filter>\r
+    <ClCompile Include="PropCodepage.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropColors.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PropCompare.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
     </ClCompile>\r
     <ClCompile Include="PropCompareBinary.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="DirViewColItems.cpp">\r
-      <Filter>Source Files</Filter>\r
+    <ClCompile Include="PropCompareFolder.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="DirActions.cpp">\r
-      <Filter>Source Files</Filter>\r
+    <ClCompile Include="PropCompareImage.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="DropHandler.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
+    <ClCompile Include="PropEditor.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="OptionsDef.cpp">\r
-      <Filter>Source Files</Filter>\r
+    <ClCompile Include="PropGeneral.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="Common\scbarg.cpp">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClCompile Include="PropMarkerColors.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="Common\scbarcf.cpp">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClCompile Include="PropRegistry.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="Common\sizecbar.cpp">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClCompile Include="PropShell.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="Common\BCMenu.cpp">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClCompile Include="PropSyntaxColors.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="Common\MDITabBar.cpp">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClCompile Include="PropTextColors.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="Common\MessageBoxDialog.cpp">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClCompile Include="Common\ClipBoard.cpp">\r
+      <Filter>Common\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="Common\SuperComboBox.cpp">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClCompile Include="Common\coretools.cpp">\r
+      <Filter>Common\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="Common\SplitterWndEx.cpp">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClCompile Include="Common\lwdisp.c">\r
+      <Filter>Common\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="Common\Bitmap.cpp">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClCompile Include="Common\RegKey.cpp">\r
+      <Filter>Common\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="Common\Picture.cpp">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClCompile Include="Common\ShellFileOperations.cpp">\r
+      <Filter>Common\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="Common\ShellContextMenu.cpp">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClCompile Include="Common\UniFile.cpp">\r
+      <Filter>Common\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="Common\PropertyPageHost.cpp">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClCompile Include="Common\UnicodeString.cpp">\r
+      <Filter>Common\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="TrDialogs.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
+    <ClCompile Include="Common\unicoder.cpp">\r
+      <Filter>Common\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="MergeStatusBar.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
+    <ClCompile Include="Common\RegOptionsMgr.cpp">\r
+      <Filter>Common\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="diffutils\src\mystat.cpp">\r
-      <Filter>GNU diffutils</Filter>\r
+    <ClCompile Include="Common\PidlContainer.cpp">\r
+      <Filter>Common\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\go.cpp">\r
-      <Filter>EditLib\parsers</Filter>\r
+    <ClCompile Include="common\OptionsMgr.cpp">\r
+      <Filter>Common\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\rust.cpp">\r
-      <Filter>EditLib\parsers</Filter>\r
+    <ClCompile Include="Common\multiformatText.cpp">\r
+      <Filter>Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\ExConverter.cpp">\r
+      <Filter>Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\varprop.cpp">\r
+      <Filter>Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaleditview.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
     </ClCompile>\r
     <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.cpp">\r
-      <Filter>EditLib</Filter>\r
+      <Filter>EditLib\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview2.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ceditreplacedlg.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\cfindtextdlg.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\chcondlg.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\cregexp_poco.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\crystaleditviewex.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\crystalparser.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\crystaltextblock.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\cs2cs.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
     </ClCompile>\r
     <ClCompile Include="..\Externals\crystaledit\editlib\ctextmarkerdlg.cpp">\r
-      <Filter>EditLib</Filter>\r
+      <Filter>EditLib\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="PropMarkerColors.cpp">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\filesup.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="Common\VersionInfo.cpp">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\fpattern.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="MergeEditSplitterView.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\gotodlg.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="CompareEngines\Wrap_DiffUtils.cpp">\r
-      <Filter>Compare Engines</Filter>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\LineInfo.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="Test.cpp">\r
-      <Filter>MergeTest</Filter>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\memcombo.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="TestMain.cpp">\r
-      <Filter>MergeTest</Filter>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\registry.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\Externals\gtest\src\gtest-all.cc">\r
-      <Filter>MergeTest\gtest</Filter>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\statbar.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="Merge7zFormatShellImpl.cpp">\r
-      <Filter>Source Files</Filter>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\string_util.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\SyntaxColors.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\UndoRecord.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ViewableWhitespace.cpp">\r
+      <Filter>EditLib\Source Files</Filter>\r
     </ClCompile>\r
     <ClCompile Include="..\Externals\crystaledit\editlib\wcwidth.cpp">\r
-      <Filter>EditLib</Filter>\r
+      <Filter>EditLib\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="pch.cpp">\r
-      <Filter>Source Files</Filter>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\asp.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="OptionsPanel.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\basic.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\Externals\crystaledit\editlib\plain.cpp">\r
-      <Filter>EditLib\parsers</Filter>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\batch.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\cplusplus.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\csharp.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\css.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\dcl.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\fortran.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\go.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\html.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ini.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\innosetup.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\is.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\java.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\lisp.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
     </ClCompile>\r
     <ClCompile Include="..\Externals\crystaledit\editlib\lua.cpp">\r
-      <Filter>EditLib\parsers</Filter>\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="MergeEditFrm.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\nsis.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\pascal.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\perl.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\php.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\plain.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\po.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\powershell.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\python.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\rexx.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\rsrc.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ruby.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\rust.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\sgml.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\sh.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\siod.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\sql.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\tcl.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\tex.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\verilog.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\vhdl.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\xml.cpp">\r
+      <Filter>EditLib\Parsers\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareEngines\BinaryCompare.cpp">\r
+      <Filter>Compare Engines\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareEngines\ByteComparator.cpp">\r
+      <Filter>Compare Engines\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareEngines\ByteCompare.cpp">\r
+      <Filter>Compare Engines\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareEngines\TimeSizeCompare.cpp">\r
+      <Filter>Compare Engines\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareEngines\Wrap_DiffUtils.cpp">\r
+      <Filter>Compare Engines\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\VersionInfo.cpp">\r
+      <Filter>Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\ShellContextMenu.cpp">\r
+      <Filter>Common\Source Files</Filter>\r
     </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
@@ -807,9 +852,6 @@
     <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
@@ -906,9 +948,6 @@
     <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
@@ -918,15 +957,9 @@
     <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
@@ -936,9 +969,6 @@
     <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
@@ -948,15 +978,6 @@
     <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
@@ -966,21 +987,9 @@
     <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
@@ -993,93 +1002,6 @@
     <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
@@ -1146,311 +1068,434 @@
     <ClInclude Include="DirDoc.h">\r
       <Filter>MFCGui\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="DirFrame.h">\r
+    <ClInclude Include="DirFrame.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DirView.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="EditorFilepathBar.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="EncodingErrorBar.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="FileActionScript.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="FilepathEdit.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="IListCtrlImpl.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="MergeLineFlags.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="MergeApp.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DirCompProgressBar.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Diff3.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="OptionsFont.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="OptionsSyntaxColors.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="OptionsDiffColors.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="OptionsDiffOptions.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PatchTool.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="JumpList.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="OptionsCustomColors.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="7zCommon.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="ImgMergeFrm.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="IMergeDoc.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Merge7zFormatMergePluginImpl.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Merge7zFormatRegister.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DirViewColItems.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DirActions.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="HexMergeView.h">\r
       <Filter>MFCGui\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="DirView.h">\r
+    <ClInclude Include="OptionsPanel.h">\r
       <Filter>MFCGui\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="EditorFilepathBar.h">\r
+    <ClInclude Include="DropHandler.h">\r
       <Filter>MFCGui\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="EncodingErrorBar.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
+    <ClInclude Include="Constants.h">\r
+      <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="FileActionScript.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
+    <ClInclude Include="OptionsInit.h">\r
+      <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="FilepathEdit.h">\r
+    <ClInclude Include="TrDialogs.h">\r
       <Filter>MFCGui\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Common\LanguageSelect.h">\r
+    <ClInclude Include="MergeStatusBar.h">\r
       <Filter>MFCGui\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="IListCtrlImpl.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
+    <ClInclude Include="..\Externals\boost\boost\config.hpp">\r
+      <Filter>Boost</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="MergeLineFlags.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
+    <ClInclude Include="..\Externals\boost\boost\config\compiler\visualc.hpp">\r
+      <Filter>Boost\config\compiler</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="MergeApp.h">\r
-      <Filter>Header Files</Filter>\r
+    <ClInclude Include="..\Externals\boost\boost\config\select_compiler_config.hpp">\r
+      <Filter>Boost\config</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Common\ExConverter.h">\r
+    <ClInclude Include="..\Version.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="DirCompProgressBar.h">\r
+    <ClInclude Include="MergeEditSplitterView.h">\r
       <Filter>MFCGui\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Diff3.h">\r
-      <Filter>Header Files</Filter>\r
+    <ClInclude Include="TestMain.h">\r
+      <Filter>MergeTest</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="OptionsFont.h">\r
+    <ClInclude Include="Win_VersionHelper.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="OptionsSyntaxColors.h">\r
-      <Filter>Header Files</Filter>\r
+    <ClInclude Include="..\Externals\gtest\include\gtest\gtest.h">\r
+      <Filter>MergeTest\gtest</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="OptionsDiffColors.h">\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="OptionsDiffOptions.h">\r
+    <ClInclude Include="pch.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="PropArchive.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClInclude Include="MergeEditFrm.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="PropBackups.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClInclude Include="Common\BCMenu.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="PropCodepage.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClInclude Include="Common\Bitmap.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="PropColors.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClInclude Include="Common\CMoveConstraint.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="PropCompare.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClInclude Include="Common\ColorButton.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="PropCompareFolder.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClInclude Include="Common\LanguageSelect.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="PropEditor.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClInclude Include="Common\MDITabBar.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="PropGeneral.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClInclude Include="Common\memdc.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="PropRegistry.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClInclude Include="Common\MessageBoxDialog.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="PropShell.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClInclude Include="Common\Picture.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="PropSyntaxColors.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClInclude Include="Common\scbarcf.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="PropTextColors.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClInclude Include="Common\PropertyPageHost.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\scbarg.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\sizecbar.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\SortHeaderCtrl.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\SplitterWndEx.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\SuperComboBox.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
     </ClInclude>\r
     <ClInclude Include="AboutDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
     </ClInclude>\r
     <ClInclude Include="CompareStatisticsDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
     </ClInclude>\r
     <ClInclude Include="ConfirmFolderCopyDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
     </ClInclude>\r
     <ClInclude Include="DirCmpReportDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="FileFiltersDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+    <ClInclude Include="DirColsDlg.h">\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="LoadSaveCodepageDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+    <ClInclude Include="FileFiltersDlg.h">\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
     </ClInclude>\r
     <ClInclude Include="LineFiltersDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="LoadSaveCodepageDlg.h">\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
     </ClInclude>\r
     <ClInclude Include="PatchDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
     </ClInclude>\r
     <ClInclude Include="PluginsListDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\PreferencesDlg.h">\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
     </ClInclude>\r
     <ClInclude Include="SaveClosingDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
     </ClInclude>\r
     <ClInclude Include="SelectUnpackerDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
     </ClInclude>\r
     <ClInclude Include="SharedFilterDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
     </ClInclude>\r
     <ClInclude Include="TestFilterDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+      <Filter>MFCGui\Dialogs\Header Files</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
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="PatchTool.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
+    <ClInclude Include="PropArchive.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Common\PreferencesDlg.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
+    <ClInclude Include="PropBackups.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="JumpList.h">\r
-      <Filter>Header Files</Filter>\r
+    <ClInclude Include="PropCodepage.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Common\ClipBoard.h">\r
-      <Filter>Header Files</Filter>\r
+    <ClInclude Include="PropColors.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="OptionsCustomColors.h">\r
-      <Filter>Header Files</Filter>\r
+    <ClInclude Include="PropCompare.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="7zCommon.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
+    <ClInclude Include="PropCompareBinary.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="ImgMergeFrm.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
+    <ClInclude Include="PropCompareFolder.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
     </ClInclude>\r
     <ClInclude Include="PropCompareImage.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="IMergeDoc.h">\r
-      <Filter>Header Files</Filter>\r
+    <ClInclude Include="PropEditor.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Merge7zFormatMergePluginImpl.h">\r
-      <Filter>Header Files</Filter>\r
+    <ClInclude Include="PropGeneral.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Merge7zFormatRegister.h">\r
-      <Filter>Header Files</Filter>\r
+    <ClInclude Include="PropMarkerColors.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="CompareEngines\BinaryCompare.h">\r
-      <Filter>Compare Engines</Filter>\r
+    <ClInclude Include="PropRegistry.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="DirViewColItems.h">\r
-      <Filter>Header Files</Filter>\r
+    <ClInclude Include="PropShell.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="DirActions.h">\r
-      <Filter>Header Files</Filter>\r
+    <ClInclude Include="PropSyntaxColors.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="HexMergeView.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
+    <ClInclude Include="PropTextColors.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="PropCompareBinary.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClInclude Include="Common\ClipBoard.h">\r
+      <Filter>Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Common\SuperComboBox.h">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClInclude Include="Common\coretools.h">\r
+      <Filter>Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Common\SortHeaderCtrl.h">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClInclude Include="Common\lwdisp.h">\r
+      <Filter>Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Common\CMoveConstraint.h">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClInclude Include="Common\ExConverter.h">\r
+      <Filter>Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Common\MDITabBar.h">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClInclude Include="Common\UniFile.h">\r
+      <Filter>Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Common\PropertyPageHost.h">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClInclude Include="Common\UnicodeString.h">\r
+      <Filter>Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Common\SplitterWndEx.h">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClInclude Include="Common\unicoder.h">\r
+      <Filter>Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Common\sizecbar.h">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClInclude Include="Common\ShellFileOperations.h">\r
+      <Filter>Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Common\scbarg.h">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClInclude Include="Common\RegOptionsMgr.h">\r
+      <Filter>Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Common\scbarcf.h">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClInclude Include="Common\RegKey.h">\r
+      <Filter>Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Common\MessageBoxDialog.h">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClInclude Include="Common\PidlContainer.h">\r
+      <Filter>Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="OptionsPanel.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
+    <ClInclude Include="common\OptionsMgr.h">\r
+      <Filter>Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Common\Bitmap.h">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClInclude Include="Common\varprop.h">\r
+      <Filter>Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Common\memdc.h">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClInclude Include="Common\multiformatText.h">\r
+      <Filter>Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Common\ShellContextMenu.h">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaleditview.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Common\BCMenu.h">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Common\ColorButton.h">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Common\Picture.h">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextview.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="DropHandler.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\ceditreplacedlg.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Constants.h">\r
-      <Filter>Header Files</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\cfindtextdlg.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="OptionsInit.h">\r
-      <Filter>Header Files</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\cregexp.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="TrDialogs.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\chcondlg.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="MergeStatusBar.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\crystaleditviewex.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.h">\r
-      <Filter>EditLib</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\crystalparser.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="PropMarkerColors.h">\r
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\crystaltextblock.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\cs2cs.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
     <ClInclude Include="..\Externals\crystaledit\editlib\ctextmarkerdlg.h">\r
-      <Filter>EditLib</Filter>\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\Externals\boost\boost\config.hpp">\r
-      <Filter>Boost</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\editreg.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\Externals\boost\boost\config\compiler\visualc.hpp">\r
-      <Filter>Boost\config\compiler</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\editcmd.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\Externals\boost\boost\config\select_compiler_config.hpp">\r
-      <Filter>Boost\config</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\edtlib.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\Version.h">\r
-      <Filter>Header Files</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\filesup.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Common\VersionInfo.h">\r
-      <Filter>MFCGui\Common</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\fpattern.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="MergeEditSplitterView.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\gotodlg.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="CompareEngines\Wrap_DiffUtils.h">\r
-      <Filter>Compare Engines</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\LineInfo.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="TestMain.h">\r
-      <Filter>MergeTest</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\memcombo.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Win_VersionHelper.h">\r
-      <Filter>Header Files</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\registry.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\Externals\gtest\include\gtest\gtest.h">\r
-      <Filter>MergeTest\gtest</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\statbar.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\Externals\gtest\include\gtest\gtest-printers.h">\r
-      <Filter>MergeTest\gtest</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\string_util.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\Externals\gtest\include\gtest\internal\gtest-port.h">\r
-      <Filter>MergeTest\gtest</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\SyntaxColors.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Merge7zFormatShellImpl.h">\r
-      <Filter>Header Files</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\UndoRecord.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\ViewableWhitespace.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
     <ClInclude Include="..\Externals\crystaledit\editlib\wcwidth.h">\r
-      <Filter>EditLib</Filter>\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="pch.h">\r
-      <Filter>Header Files</Filter>\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\wispelld.h">\r
+      <Filter>EditLib\Header Files</Filter>\r
     </ClInclude>\r
     <ClInclude Include="..\Externals\crystaledit\editlib\crystallineparser.h">\r
-      <Filter>EditLib\parsers</Filter>\r
+      <Filter>EditLib\Parsers\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="MergeEditFrm.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
+    <ClInclude Include="CompareEngines\BinaryCompare.h">\r
+      <Filter>Compare Engines\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="CompareEngines\ByteComparator.h">\r
+      <Filter>Compare Engines\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="CompareEngines\ByteCompare.h">\r
+      <Filter>Compare Engines\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="CompareEngines\TimeSizeCompare.h">\r
+      <Filter>Compare Engines\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="CompareEngines\Wrap_DiffUtils.h">\r
+      <Filter>Compare Engines\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\VersionInfo.h">\r
+      <Filter>Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\ShellContextMenu.h">\r
+      <Filter>Common\Header Files</Filter>\r
     </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
About OSDN
Find Software
Develop Software
Help