Merge with stable

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

diff --git a/Src/Merge.vcxproj.filters b/Src/Merge.vcxproj.filters
index 121e791..15da5fe 100644 (file)
--- a/Src/Merge.vcxproj.filters
+++ b/Src/Merge.vcxproj.filters
@@ -142,9 +142,6 @@
     <ClCompile Include="FolderCmp.cpp">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="LineFiltersList.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="locality.cpp">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
@@ -709,9 +706,6 @@
     <ClCompile Include="Common\SortHeaderCtrl.cpp">\r
       <Filter>MFCGui\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="SourceControl.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="Common\PreferencesDlg.cpp">\r
       <Filter>MFCGui\Dialogs</Filter>\r
     </ClCompile>\r
@@ -727,18 +721,9 @@
     <ClCompile Include="Splash.cpp">\r
       <Filter>MFCGui\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="CustomStatusCursor.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="Common\ClipBoard.cpp">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="DirActions.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="DirViewColItems.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="OptionsCustomColors.cpp">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
@@ -754,6 +739,21 @@
     <ClCompile Include="Merge7zFormatMergePluginImpl.cpp">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="LineFiltersList.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="SourceControl.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DirViewColItems.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DirActions.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="CustomStatusCursor.cpp">\r
+      <Filter>MFCGui\Source Files</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="charsets.h">\r
@@ -933,6 +933,9 @@
     <ClInclude Include="Common\ShellFileOperations.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="ssapi.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
     <ClInclude Include="stringdiffs.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
@@ -1065,6 +1068,9 @@
     <ClInclude Include="..\Externals\crystaledit\editlib\wispelld.h">\r
       <Filter>EditLib</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="WaitStatusCursor.h">\r
+      <Filter>MFCGui\Header Files</Filter>\r
+    </ClInclude>\r
     <ClInclude Include="Common\ToolbarXPThemes.h">\r
       <Filter>MFCGui\Header Files</Filter>\r
     </ClInclude>\r
@@ -1164,9 +1170,6 @@
     <ClInclude Include="FileOrFolderSelect.h">\r
       <Filter>MFCGui\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="7zCommon.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="BCMenu.h">\r
       <Filter>MFCGui\Header Files</Filter>\r
     </ClInclude>\r
@@ -1356,37 +1359,16 @@
     <ClInclude Include="Common\DragDrop.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="ssauto.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="Common\MyCom.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="SourceControl.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="DDXHelper.h">\r
-      <Filter>MFCGui\Dialogs</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="CustomStatusCursor.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="DirActions.h">\r
+    <ClInclude Include="Common\ClipBoard.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="DirItemIterator.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="DirViewColItems.h">\r
+    <ClInclude Include="OptionsCustomColors.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="WaitStatusCursor.h">\r
+    <ClInclude Include="7zCommon.h">\r
       <Filter>MFCGui\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Common\ClipBoard.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="OptionsCustomColors.h">\r
+    <ClInclude Include="Merge7zFormatShellImpl.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
     <ClInclude Include="ImgMergeFrm.h">\r
@@ -1404,6 +1386,9 @@
     <ClInclude Include="Merge7zFormatRegister.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="DirViewColItems.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <None Include="res\binarydiff.ico">\r