فهرست منبع

fixed merge issue

git-svn-id: svn://svn.code.sf.net/p/ditto-cp/code/trunk@777 595ec19a-5cb4-439b-94a8-42fb3063c22c
sabrogden 10 سال پیش
والد
کامیت
01e3cc0e7b
1فایلهای تغییر یافته به همراه12 افزوده شده و 5 حذف شده
  1. 12 5
      CP_Main.vcxproj.filters

+ 12 - 5
CP_Main.vcxproj.filters

@@ -388,16 +388,15 @@
     <ClCompile Include="DrawHTML.C">
       <Filter>source</Filter>
     </ClCompile>
-<<<<<<< .mine
-    <ClCompile Include="DittoPopupWindow.cpp" />
-=======
+    <ClCompile Include="DittoPopupWindow.cpp">
+      <Filter>source</Filter>
+    </ClCompile>
     <ClCompile Include="TrayWnd.cpp">
       <Filter>source</Filter>
     </ClCompile>
     <ClCompile Include="SpecialPasteOptions.cpp">
       <Filter>source</Filter>
     </ClCompile>
->>>>>>> .r772
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="sqlite\CppSQLite3.h">
@@ -838,7 +837,9 @@
     <ClInclude Include="DrawHTML.h">
       <Filter>header</Filter>
     </ClInclude>
-    <ClInclude Include="DittoPopupWindow.h" />
+    <ClInclude Include="DittoPopupWindow.h">
+      <Filter>header</Filter>
+    </ClInclude>
     <ClInclude Include="SpecialPasteOptions.h">
       <Filter>header</Filter>
     </ClInclude>
@@ -1115,6 +1116,12 @@
     <None Include="res\yellow_star_32_32.png">
       <Filter>res</Filter>
     </None>
+    <None Include="res\Ditto3.ico">
+      <Filter>res</Filter>
+    </None>
+    <None Include="res\Ditto3_NoCopyCb.ico">
+      <Filter>res</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="sqlite">