Skip to content
Permalink
Browse files

Rename PropColors.* to PropMergeColors.*

  • Loading branch information
sdottaka committed Mar 22, 2020
1 parent f22eca0 commit 043e87aceee07c4156b35dccf111db04c452f196
@@ -14,7 +14,7 @@
#include "PropCompare.h"
#include "PropEditor.h"
#include "PropRegistry.h"
#include "PropColors.h"
#include "PropMergeColors.h"
#include "PropTextColors.h"
#include "PropSyntaxColors.h"
#include "PropMarkerColors.h"
@@ -893,7 +893,7 @@
<ClCompile Include="PropArchive.cpp" />
<ClCompile Include="PropBackups.cpp" />
<ClCompile Include="PropCodepage.cpp" />
<ClCompile Include="PropColors.cpp" />
<ClCompile Include="PropMergeColors.cpp" />
<ClCompile Include="PropCompare.cpp" />
<ClCompile Include="PropCompareBinary.cpp" />
<ClCompile Include="PropCompareFolder.cpp" />
@@ -1243,7 +1243,7 @@
<ClInclude Include="PropArchive.h" />
<ClInclude Include="PropBackups.h" />
<ClInclude Include="PropCodepage.h" />
<ClInclude Include="PropColors.h" />
<ClInclude Include="PropMergeColors.h" />
<ClInclude Include="PropCompare.h" />
<ClInclude Include="PropCompareBinary.h" />
<ClInclude Include="PropCompareFolder.h" />
@@ -553,9 +553,6 @@
<ClCompile Include="PropCodepage.cpp">
<Filter>MFCGui\PropertyPages\Source Files</Filter>
</ClCompile>
<ClCompile Include="PropColors.cpp">
<Filter>MFCGui\PropertyPages\Source Files</Filter>
</ClCompile>
<ClCompile Include="PropCompare.cpp">
<Filter>MFCGui\PropertyPages\Source Files</Filter>
</ClCompile>
@@ -889,6 +886,9 @@
<ClCompile Include="Concurrent.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="PropMergeColors.cpp">
<Filter>MFCGui\PropertyPages\Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="charsets.h">
@@ -1365,9 +1365,6 @@
<ClInclude Include="PropCodepage.h">
<Filter>MFCGui\PropertyPages\Header Files</Filter>
</ClInclude>
<ClInclude Include="PropColors.h">
<Filter>MFCGui\PropertyPages\Header Files</Filter>
</ClInclude>
<ClInclude Include="PropCompare.h">
<Filter>MFCGui\PropertyPages\Header Files</Filter>
</ClInclude>
@@ -1608,6 +1605,9 @@
<ClInclude Include="Concurrent.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="PropMergeColors.h">
<Filter>MFCGui\PropertyPages\Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="res\binarydiff.ico">
@@ -892,7 +892,7 @@
<ClCompile Include="PropArchive.cpp" />
<ClCompile Include="PropBackups.cpp" />
<ClCompile Include="PropCodepage.cpp" />
<ClCompile Include="PropColors.cpp" />
<ClCompile Include="PropMergeColors.cpp" />
<ClCompile Include="PropCompare.cpp" />
<ClCompile Include="PropCompareBinary.cpp" />
<ClCompile Include="PropCompareFolder.cpp" />
@@ -1107,6 +1107,7 @@
<ClInclude Include="..\Version.h" />
<ClInclude Include="7zCommon.h" />
<ClInclude Include="AboutDlg.h" />
<ClInclude Include="Concurrent.h" />
<ClInclude Include="Common\BCMenu.h" />
<ClInclude Include="Common\Bitmap.h" />
<ClInclude Include="charsets.h" />
@@ -1241,7 +1242,7 @@
<ClInclude Include="PropArchive.h" />
<ClInclude Include="PropBackups.h" />
<ClInclude Include="PropCodepage.h" />
<ClInclude Include="PropColors.h" />
<ClInclude Include="PropMergeColors.h" />
<ClInclude Include="PropCompare.h" />
<ClInclude Include="PropCompareBinary.h" />
<ClInclude Include="PropCompareFolder.h" />
@@ -553,9 +553,6 @@
<ClCompile Include="PropCodepage.cpp">
<Filter>MFCGui\PropertyPages\Source Files</Filter>
</ClCompile>
<ClCompile Include="PropColors.cpp">
<Filter>MFCGui\PropertyPages\Source Files</Filter>
</ClCompile>
<ClCompile Include="PropCompare.cpp">
<Filter>MFCGui\PropertyPages\Source Files</Filter>
</ClCompile>
@@ -889,6 +886,9 @@
<ClCompile Include="Concurrent.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="PropMergeColors.cpp">
<Filter>MFCGui\PropertyPages\Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="charsets.h">
@@ -1365,9 +1365,6 @@
<ClInclude Include="PropCodepage.h">
<Filter>MFCGui\PropertyPages\Header Files</Filter>
</ClInclude>
<ClInclude Include="PropColors.h">
<Filter>MFCGui\PropertyPages\Header Files</Filter>
</ClInclude>
<ClInclude Include="PropCompare.h">
<Filter>MFCGui\PropertyPages\Header Files</Filter>
</ClInclude>
@@ -1608,6 +1605,9 @@
<ClInclude Include="Concurrent.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="PropMergeColors.h">
<Filter>MFCGui\PropertyPages\Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="res\binarydiff.ico">
@@ -1,11 +1,11 @@
/**
* @file PropColors.cpp
* @file PropMergeColors.cpp
*
* @brief Implementation of PropMergeColors propertysheet
*/

#include "stdafx.h"
#include "PropColors.h"
#include "PropMergeColors.h"
#include "OptionsCustomColors.h"
#include "OptionsDef.h"
#include "OptionsMgr.h"
@@ -1,5 +1,5 @@
/**
* @file PropColors.h
* @file PropMergeColors.h
*
* @brief Declaration file for PropMergeColors propertyheet
*

0 comments on commit 043e87a

Please sign in to comment.
You can’t perform that action at this time.