"X", ID_EDIT_CUT, VIRTKEY, CONTROL\r
"C", ID_EDIT_COPY, VIRTKEY, CONTROL\r
"V", ID_EDIT_PASTE, VIRTKEY, CONTROL\r
+ "F", ID_EDIT_FIND, VIRTKEY, CONTROL\r
VK_BACK, ID_EDIT_UNDO, VIRTKEY, ALT\r
VK_DELETE, ID_EDIT_CUT, VIRTKEY, SHIFT\r
VK_INSERT, ID_EDIT_COPY, VIRTKEY, CONTROL\r
_tcscpy(m_lf.lfFaceName, _T("Courier New"));
m_pSyntaxColors = new SyntaxColors();
+ m_pMarkers = new CCrystalTextMarkers();
}
CSampleDoc::~CSampleDoc()
{
delete m_pSyntaxColors;
+ delete m_pMarkers;
}
BOOL CSampleDoc::OnNewDocument()
#include "CCrystalTextBuffer.h"
#include "SyntaxColors.h"
+#include "CCrystalTextMarkers.h"
class CSampleDoc : public CDocument
{
CSampleTextBuffer m_xTextBuffer;
LOGFONT m_lf;
SyntaxColors *m_pSyntaxColors;
+ CCrystalTextMarkers *m_pMarkers;
// Operations
public:
-<?xml version="1.0" encoding="utf-8"?>\r
+<?xml version="1.0" encoding="utf-8"?>\r
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
<ItemGroup Label="ProjectConfigurations">\r
<ProjectConfiguration Include="Debug|Win32">\r
<ProjectGuid>{C347D6AE-7A2B-4ED0-97AD-2595E1C5D7DD}</ProjectGuid>\r
<RootNamespace>SampleStatic</RootNamespace>\r
<Keyword>MFCProj</Keyword>\r
+ <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>\r
</PropertyGroup>\r
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'" Label="Configuration">\r
<ConfigurationType>Application</ConfigurationType>\r
- <PlatformToolset>v141</PlatformToolset>\r
+ <PlatformToolset>v140_xp</PlatformToolset>\r
<UseOfMfc>Dynamic</UseOfMfc>\r
<CharacterSet>Unicode</CharacterSet>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'" Label="Configuration">\r
<ConfigurationType>Application</ConfigurationType>\r
- <PlatformToolset>v141</PlatformToolset>\r
+ <PlatformToolset>v140_xp</PlatformToolset>\r
<UseOfMfc>Dynamic</UseOfMfc>\r
<CharacterSet>Unicode</CharacterSet>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
<ConfigurationType>Application</ConfigurationType>\r
- <PlatformToolset>v141</PlatformToolset>\r
+ <PlatformToolset>v140_xp</PlatformToolset>\r
<UseOfMfc>Dynamic</UseOfMfc>\r
<CharacterSet>MultiByte</CharacterSet>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
<ConfigurationType>Application</ConfigurationType>\r
- <PlatformToolset>v141</PlatformToolset>\r
+ <PlatformToolset>v140_xp</PlatformToolset>\r
<UseOfMfc>Dynamic</UseOfMfc>\r
<CharacterSet>MultiByte</CharacterSet>\r
</PropertyGroup>\r
<ClCompile Include="..\editlib\batch.cpp" />\r
<ClCompile Include="..\editlib\ccrystaleditview.cpp" />\r
<ClCompile Include="..\editlib\ccrystaltextbuffer.cpp" />\r
+ <ClCompile Include="..\editlib\ccrystaltextmarkers.cpp" />\r
<ClCompile Include="..\editlib\ccrystaltextview.cpp" />\r
<ClCompile Include="..\editlib\ccrystaltextview2.cpp" />\r
<ClCompile Include="..\editlib\ceditreplacedlg.cpp" />\r
<ItemGroup>\r
<ClInclude Include="..\editlib\ccrystaleditview.h" />\r
<ClInclude Include="..\editlib\ccrystaltextbuffer.h" />\r
+ <ClInclude Include="..\editlib\ccrystaltextmarkers.h" />\r
<ClInclude Include="..\editlib\ccrystaltextview.h" />\r
<ClInclude Include="..\editlib\ceditreplacedlg.h" />\r
<ClInclude Include="..\editlib\cfindtextdlg.h" />\r
<ClCompile Include="..\editlib\go.cpp">\r
<Filter>editlib\parsers</Filter>\r
</ClCompile>\r
+ <ClCompile Include="..\editlib\ccrystaltextmarkers.cpp">\r
+ <Filter>editlib</Filter>\r
+ </ClCompile>\r
</ItemGroup>\r
<ItemGroup>\r
<ResourceCompile Include="Sample.rc">\r
<ClInclude Include="..\editlib\wispelld.h">\r
<Filter>editlib</Filter>\r
</ClInclude>\r
+ <ClInclude Include="..\editlib\ccrystaltextmarkers.h">\r
+ <Filter>editlib</Filter>\r
+ </ClInclude>\r
</ItemGroup>\r
<ItemGroup>\r
<Image Include="res\mg_icons.bmp">\r
--- /dev/null
+\r
+Microsoft Visual Studio Solution File, Format Version 12.00\r
+# Visual Studio 14\r
+VisualStudioVersion = 14.0.25420.1\r
+MinimumVisualStudioVersion = 10.0.40219.1\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleStatic", "SampleStatic.vcxproj", "{C347D6AE-7A2B-4ED0-97AD-2595E1C5D7DD}"\r
+EndProject\r
+Global\r
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
+ Debug|Win32 = Debug|Win32\r
+ Release|Win32 = Release|Win32\r
+ Unicode Debug|Win32 = Unicode Debug|Win32\r
+ Unicode Release|Win32 = Unicode Release|Win32\r
+ EndGlobalSection\r
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
+ {C347D6AE-7A2B-4ED0-97AD-2595E1C5D7DD}.Debug|Win32.ActiveCfg = Debug|Win32\r
+ {C347D6AE-7A2B-4ED0-97AD-2595E1C5D7DD}.Debug|Win32.Build.0 = Debug|Win32\r
+ {C347D6AE-7A2B-4ED0-97AD-2595E1C5D7DD}.Release|Win32.ActiveCfg = Release|Win32\r
+ {C347D6AE-7A2B-4ED0-97AD-2595E1C5D7DD}.Release|Win32.Build.0 = Release|Win32\r
+ {C347D6AE-7A2B-4ED0-97AD-2595E1C5D7DD}.Unicode Debug|Win32.ActiveCfg = Unicode Debug|Win32\r
+ {C347D6AE-7A2B-4ED0-97AD-2595E1C5D7DD}.Unicode Debug|Win32.Build.0 = Unicode Debug|Win32\r
+ {C347D6AE-7A2B-4ED0-97AD-2595E1C5D7DD}.Unicode Release|Win32.ActiveCfg = Unicode Release|Win32\r
+ {C347D6AE-7A2B-4ED0-97AD-2595E1C5D7DD}.Unicode Release|Win32.Build.0 = Unicode Release|Win32\r
+ EndGlobalSection\r
+ GlobalSection(SolutionProperties) = preSolution\r
+ HideSolutionNode = FALSE\r
+ EndGlobalSection\r
+ GlobalSection(ExtensibilityGlobals) = postSolution\r
+ SolutionGuid = {6D875F13-7AF3-4BE0-B667-DD8052CBF835}\r
+ EndGlobalSection\r
+EndGlobal\r
--- /dev/null
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+ <ItemGroup Label="ProjectConfigurations">\r
+ <ProjectConfiguration Include="Debug|Win32">\r
+ <Configuration>Debug</Configuration>\r
+ <Platform>Win32</Platform>\r
+ </ProjectConfiguration>\r
+ <ProjectConfiguration Include="Release|Win32">\r
+ <Configuration>Release</Configuration>\r
+ <Platform>Win32</Platform>\r
+ </ProjectConfiguration>\r
+ <ProjectConfiguration Include="Unicode Debug|Win32">\r
+ <Configuration>Unicode Debug</Configuration>\r
+ <Platform>Win32</Platform>\r
+ </ProjectConfiguration>\r
+ <ProjectConfiguration Include="Unicode Release|Win32">\r
+ <Configuration>Unicode Release</Configuration>\r
+ <Platform>Win32</Platform>\r
+ </ProjectConfiguration>\r
+ </ItemGroup>\r
+ <PropertyGroup Label="Globals">\r
+ <ProjectGuid>{C347D6AE-7A2B-4ED0-97AD-2595E1C5D7DD}</ProjectGuid>\r
+ <RootNamespace>SampleStatic</RootNamespace>\r
+ <Keyword>MFCProj</Keyword>\r
+ </PropertyGroup>\r
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'" Label="Configuration">\r
+ <ConfigurationType>Application</ConfigurationType>\r
+ <PlatformToolset>v141</PlatformToolset>\r
+ <UseOfMfc>Dynamic</UseOfMfc>\r
+ <CharacterSet>Unicode</CharacterSet>\r
+ </PropertyGroup>\r
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'" Label="Configuration">\r
+ <ConfigurationType>Application</ConfigurationType>\r
+ <PlatformToolset>v141</PlatformToolset>\r
+ <UseOfMfc>Dynamic</UseOfMfc>\r
+ <CharacterSet>Unicode</CharacterSet>\r
+ </PropertyGroup>\r
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
+ <ConfigurationType>Application</ConfigurationType>\r
+ <PlatformToolset>v141</PlatformToolset>\r
+ <UseOfMfc>Dynamic</UseOfMfc>\r
+ <CharacterSet>MultiByte</CharacterSet>\r
+ </PropertyGroup>\r
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
+ <ConfigurationType>Application</ConfigurationType>\r
+ <PlatformToolset>v141</PlatformToolset>\r
+ <UseOfMfc>Dynamic</UseOfMfc>\r
+ <CharacterSet>MultiByte</CharacterSet>\r
+ </PropertyGroup>\r
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+ <ImportGroup Label="ExtensionSettings">\r
+ </ImportGroup>\r
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'" Label="PropertySheets">\r
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />\r
+ </ImportGroup>\r
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'" Label="PropertySheets">\r
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />\r
+ </ImportGroup>\r
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />\r
+ </ImportGroup>\r
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">\r
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />\r
+ </ImportGroup>\r
+ <PropertyGroup Label="UserMacros" />\r
+ <PropertyGroup>\r
+ <_ProjectFileVersion>15.0.26730.3</_ProjectFileVersion>\r
+ </PropertyGroup>\r
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+ <OutDir>.\Debug\</OutDir>\r
+ <IntDir>.\Debug\</IntDir>\r
+ <LinkIncremental>true</LinkIncremental>\r
+ </PropertyGroup>\r
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+ <OutDir>.\Release\</OutDir>\r
+ <IntDir>.\Release\</IntDir>\r
+ <LinkIncremental>false</LinkIncremental>\r
+ </PropertyGroup>\r
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'">\r
+ <OutDir>.\UDebug\</OutDir>\r
+ <IntDir>.\UDebug\</IntDir>\r
+ <LinkIncremental>true</LinkIncremental>\r
+ </PropertyGroup>\r
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'">\r
+ <OutDir>.\URelease\</OutDir>\r
+ <IntDir>.\URelease\</IntDir>\r
+ <LinkIncremental>false</LinkIncremental>\r
+ </PropertyGroup>\r
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+ <Midl>\r
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+ <MkTypLibCompatible>true</MkTypLibCompatible>\r
+ <SuppressStartupBanner>true</SuppressStartupBanner>\r
+ <TargetEnvironment>Win32</TargetEnvironment>\r
+ <TypeLibraryName>.\Debug/SampleStatic.tlb</TypeLibraryName>\r
+ <HeaderFileName />\r
+ </Midl>\r
+ <ClCompile>\r
+ <Optimization>Disabled</Optimization>\r
+ <AdditionalIncludeDirectories>.;..\editlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+ <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;EDITPADC_CLASS=;CRYSTALEDIT_ENABLELOADER;CRYSTALEDIT_ENABLESAVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+ <MinimalRebuild>true</MinimalRebuild>\r
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
+ <PrecompiledHeader>Use</PrecompiledHeader>\r
+ <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
+ <PrecompiledHeaderOutputFile>.\Debug/SampleStatic.pch</PrecompiledHeaderOutputFile>\r
+ <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>\r
+ <ObjectFileName>.\Debug/</ObjectFileName>\r
+ <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>\r
+ <BrowseInformation>true</BrowseInformation>\r
+ <WarningLevel>Level4</WarningLevel>\r
+ <SuppressStartupBanner>true</SuppressStartupBanner>\r
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
+ </ClCompile>\r
+ <ResourceCompile>\r
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+ <Culture>0x0409</Culture>\r
+ <AdditionalIncludeDirectories>..\crystaledit;..;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+ </ResourceCompile>\r
+ <Link>\r
+ <AdditionalDependencies>imm32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+ <OutputFile>.\Debug/SampleStatic.exe</OutputFile>\r
+ <SuppressStartupBanner>true</SuppressStartupBanner>\r
+ <AdditionalLibraryDirectories>..\output;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <GenerateDebugInformation>true</GenerateDebugInformation>\r
+ <ProgramDatabaseFile>.\Debug/SampleStatic.pdb</ProgramDatabaseFile>\r
+ <SubSystem>Windows</SubSystem>\r
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
+ <DataExecutionPrevention />\r
+ <TargetMachine>MachineX86</TargetMachine>\r
+ </Link>\r
+ <Bscmake>\r
+ <SuppressStartupBanner>true</SuppressStartupBanner>\r
+ <OutputFile>.\Debug/SampleStatic.bsc</OutputFile>\r
+ </Bscmake>\r
+ </ItemDefinitionGroup>\r
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+ <Midl>\r
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+ <MkTypLibCompatible>true</MkTypLibCompatible>\r
+ <SuppressStartupBanner>true</SuppressStartupBanner>\r
+ <TargetEnvironment>Win32</TargetEnvironment>\r
+ <TypeLibraryName>.\Release/SampleStatic.tlb</TypeLibraryName>\r
+ <HeaderFileName />\r
+ </Midl>\r
+ <ClCompile>\r
+ <Optimization>MaxSpeed</Optimization>\r
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+ <AdditionalIncludeDirectories>.;..\editlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+ <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;EDITPADC_CLASS=;CRYSTALEDIT_ENABLELOADER;CRYSTALEDIT_ENABLESAVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+ <StringPooling>true</StringPooling>\r
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
+ <FunctionLevelLinking>true</FunctionLevelLinking>\r
+ <PrecompiledHeader>Use</PrecompiledHeader>\r
+ <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
+ <PrecompiledHeaderOutputFile>.\Release/SampleStatic.pch</PrecompiledHeaderOutputFile>\r
+ <AssemblerListingLocation>.\Release/</AssemblerListingLocation>\r
+ <ObjectFileName>.\Release/</ObjectFileName>\r
+ <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>\r
+ <WarningLevel>Level4</WarningLevel>\r
+ <SuppressStartupBanner>true</SuppressStartupBanner>\r
+ </ClCompile>\r
+ <ResourceCompile>\r
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+ <Culture>0x0419</Culture>\r
+ <AdditionalIncludeDirectories>..\crystaledit;..;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+ </ResourceCompile>\r
+ <Link>\r
+ <AdditionalDependencies>imm32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+ <OutputFile>.\Release/SampleStatic.exe</OutputFile>\r
+ <SuppressStartupBanner>true</SuppressStartupBanner>\r
+ <AdditionalLibraryDirectories>..\output;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <ProgramDatabaseFile>.\Release/SampleStatic.pdb</ProgramDatabaseFile>\r
+ <SubSystem>Windows</SubSystem>\r
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
+ <DataExecutionPrevention />\r
+ <TargetMachine>MachineX86</TargetMachine>\r
+ </Link>\r
+ <Bscmake>\r
+ <SuppressStartupBanner>true</SuppressStartupBanner>\r
+ <OutputFile>.\Release/SampleStatic.bsc</OutputFile>\r
+ </Bscmake>\r
+ </ItemDefinitionGroup>\r
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'">\r
+ <Midl>\r
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+ <MkTypLibCompatible>true</MkTypLibCompatible>\r
+ <SuppressStartupBanner>true</SuppressStartupBanner>\r
+ <TargetEnvironment>Win32</TargetEnvironment>\r
+ <TypeLibraryName>.\UDebug/SampleStatic.tlb</TypeLibraryName>\r
+ <HeaderFileName />\r
+ </Midl>\r
+ <ClCompile>\r
+ <Optimization>Disabled</Optimization>\r
+ <AdditionalIncludeDirectories>.;..\editlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+ <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_MBCS;EDITPADC_CLASS=;CRYSTALEDIT_ENABLELOADER;CRYSTALEDIT_ENABLESAVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+ <MinimalRebuild>true</MinimalRebuild>\r
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
+ <PrecompiledHeader>Use</PrecompiledHeader>\r
+ <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
+ <PrecompiledHeaderOutputFile>.\UDebug/SampleStatic.pch</PrecompiledHeaderOutputFile>\r
+ <AssemblerListingLocation>.\UDebug/</AssemblerListingLocation>\r
+ <ObjectFileName>.\UDebug/</ObjectFileName>\r
+ <ProgramDataBaseFileName>.\UDebug/</ProgramDataBaseFileName>\r
+ <WarningLevel>Level4</WarningLevel>\r
+ <SuppressStartupBanner>true</SuppressStartupBanner>\r
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
+ </ClCompile>\r
+ <ResourceCompile>\r
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+ <Culture>0x0409</Culture>\r
+ <AdditionalIncludeDirectories>..\crystaledit;..;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+ </ResourceCompile>\r
+ <Link>\r
+ <AdditionalDependencies>imm32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+ <OutputFile>.\UDebug/SampleStatic.exe</OutputFile>\r
+ <SuppressStartupBanner>true</SuppressStartupBanner>\r
+ <AdditionalLibraryDirectories>..\output;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <GenerateDebugInformation>true</GenerateDebugInformation>\r
+ <ProgramDatabaseFile>.\UDebug/SampleStatic.pdb</ProgramDatabaseFile>\r
+ <SubSystem>Windows</SubSystem>\r
+ <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>\r
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
+ <DataExecutionPrevention />\r
+ <TargetMachine>MachineX86</TargetMachine>\r
+ </Link>\r
+ <Bscmake>\r
+ <SuppressStartupBanner>true</SuppressStartupBanner>\r
+ <OutputFile>.\UDebug/SampleStatic.bsc</OutputFile>\r
+ </Bscmake>\r
+ </ItemDefinitionGroup>\r
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'">\r
+ <Midl>\r
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+ <MkTypLibCompatible>true</MkTypLibCompatible>\r
+ <SuppressStartupBanner>true</SuppressStartupBanner>\r
+ <TargetEnvironment>Win32</TargetEnvironment>\r
+ <TypeLibraryName>.\URelease/SampleStatic.tlb</TypeLibraryName>\r
+ <HeaderFileName />\r
+ </Midl>\r
+ <ClCompile>\r
+ <Optimization>MaxSpeed</Optimization>\r
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+ <AdditionalIncludeDirectories>.;..\editlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+ <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_MBCS;EDITPADC_CLASS=;CRYSTALEDIT_ENABLELOADER;CRYSTALEDIT_ENABLESAVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+ <StringPooling>true</StringPooling>\r
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
+ <FunctionLevelLinking>true</FunctionLevelLinking>\r
+ <PrecompiledHeader>Use</PrecompiledHeader>\r
+ <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
+ <PrecompiledHeaderOutputFile>.\URelease/SampleStatic.pch</PrecompiledHeaderOutputFile>\r
+ <AssemblerListingLocation>.\URelease/</AssemblerListingLocation>\r
+ <ObjectFileName>.\URelease/</ObjectFileName>\r
+ <ProgramDataBaseFileName>.\URelease/</ProgramDataBaseFileName>\r
+ <WarningLevel>Level4</WarningLevel>\r
+ <SuppressStartupBanner>true</SuppressStartupBanner>\r
+ </ClCompile>\r
+ <ResourceCompile>\r
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+ <Culture>0x0419</Culture>\r
+ <AdditionalIncludeDirectories>..\crystaledit;..;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+ </ResourceCompile>\r
+ <Link>\r
+ <AdditionalDependencies>imm32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+ <OutputFile>.\URelease/SampleStatic.exe</OutputFile>\r
+ <SuppressStartupBanner>true</SuppressStartupBanner>\r
+ <AdditionalLibraryDirectories>..\output;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <ProgramDatabaseFile>.\URelease/SampleStatic.pdb</ProgramDatabaseFile>\r
+ <SubSystem>Windows</SubSystem>\r
+ <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>\r
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
+ <DataExecutionPrevention />\r
+ <TargetMachine>MachineX86</TargetMachine>\r
+ </Link>\r
+ <Bscmake>\r
+ <SuppressStartupBanner>true</SuppressStartupBanner>\r
+ <OutputFile>.\URelease/SampleStatic.bsc</OutputFile>\r
+ </Bscmake>\r
+ </ItemDefinitionGroup>\r
+ <ItemGroup>\r
+ <ClCompile Include="..\editlib\asp.cpp" />\r
+ <ClCompile Include="..\editlib\basic.cpp" />\r
+ <ClCompile Include="..\editlib\batch.cpp" />\r
+ <ClCompile Include="..\editlib\ccrystaleditview.cpp" />\r
+ <ClCompile Include="..\editlib\ccrystaltextbuffer.cpp" />\r
+ <ClCompile Include="..\editlib\ccrystaltextmarkers.cpp" />\r
+ <ClCompile Include="..\editlib\ccrystaltextview.cpp" />\r
+ <ClCompile Include="..\editlib\ccrystaltextview2.cpp" />\r
+ <ClCompile Include="..\editlib\ceditreplacedlg.cpp" />\r
+ <ClCompile Include="..\editlib\cfindtextdlg.cpp" />\r
+ <ClCompile Include="..\editlib\chcondlg.cpp" />\r
+ <ClCompile Include="..\editlib\cplusplus.cpp" />\r
+ <ClCompile Include="..\editlib\cregexp.cpp" />\r
+ <ClCompile Include="..\editlib\crystaleditviewex.cpp" />\r
+ <ClCompile Include="..\editlib\crystalparser.cpp" />\r
+ <ClCompile Include="..\editlib\crystaltextblock.cpp" />\r
+ <ClCompile Include="..\editlib\cs2cs.cpp" />\r
+ <ClCompile Include="..\editlib\csharp.cpp" />\r
+ <ClCompile Include="..\editlib\css.cpp" />\r
+ <ClCompile Include="..\editlib\dcl.cpp" />\r
+ <ClCompile Include="..\editlib\edtlib.cpp" />\r
+ <ClCompile Include="..\editlib\filesup.cpp" />\r
+ <ClCompile Include="..\editlib\fortran.cpp" />\r
+ <ClCompile Include="..\editlib\fpattern.cpp" />\r
+ <ClCompile Include="..\editlib\go.cpp" />\r
+ <ClCompile Include="..\editlib\gotodlg.cpp" />\r
+ <ClCompile Include="..\editlib\html.cpp" />\r
+ <ClCompile Include="..\editlib\ini.cpp" />\r
+ <ClCompile Include="..\editlib\innosetup.cpp" />\r
+ <ClCompile Include="..\editlib\is.cpp" />\r
+ <ClCompile Include="..\editlib\java.cpp" />\r
+ <ClCompile Include="..\editlib\LineInfo.cpp" />\r
+ <ClCompile Include="..\editlib\lisp.cpp" />\r
+ <ClCompile Include="..\editlib\memcombo.cpp" />\r
+ <ClCompile Include="..\editlib\nsis.cpp" />\r
+ <ClCompile Include="..\editlib\pascal.cpp" />\r
+ <ClCompile Include="..\editlib\perl.cpp" />\r
+ <ClCompile Include="..\editlib\php.cpp" />\r
+ <ClCompile Include="..\editlib\po.cpp" />\r
+ <ClCompile Include="..\editlib\powershell.cpp" />\r
+ <ClCompile Include="..\editlib\python.cpp" />\r
+ <ClCompile Include="..\editlib\registry.cpp" />\r
+ <ClCompile Include="..\editlib\rexx.cpp" />\r
+ <ClCompile Include="..\editlib\rsrc.cpp" />\r
+ <ClCompile Include="..\editlib\ruby.cpp" />\r
+ <ClCompile Include="..\editlib\rust.cpp" />\r
+ <ClCompile Include="..\editlib\sgml.cpp" />\r
+ <ClCompile Include="..\editlib\sh.cpp" />\r
+ <ClCompile Include="..\editlib\siod.cpp" />\r
+ <ClCompile Include="..\editlib\splash.cpp" />\r
+ <ClCompile Include="..\editlib\sql.cpp" />\r
+ <ClCompile Include="..\editlib\statbar.cpp" />\r
+ <ClCompile Include="..\editlib\string_util.cpp">\r
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+ </PrecompiledHeader>\r
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+ </PrecompiledHeader>\r
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'">\r
+ </PrecompiledHeader>\r
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'">\r
+ </PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\SyntaxColors.cpp" />\r
+ <ClCompile Include="..\editlib\tcl.cpp" />\r
+ <ClCompile Include="..\editlib\tex.cpp" />\r
+ <ClCompile Include="..\editlib\UndoRecord.cpp" />\r
+ <ClCompile Include="..\editlib\verilog.cpp" />\r
+ <ClCompile Include="..\editlib\ViewableWhitespace.cpp" />\r
+ <ClCompile Include="..\editlib\xml.cpp" />\r
+ <ClCompile Include="ChildFrm.cpp" />\r
+ <ClCompile Include="MainFrm.cpp" />\r
+ <ClCompile Include="Sample.cpp" />\r
+ <ClCompile Include="SampleDoc.cpp" />\r
+ <ClCompile Include="SampleView.cpp" />\r
+ <ClCompile Include="StdAfx.cpp">\r
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>\r
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>\r
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'">Create</PrecompiledHeader>\r
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'">Create</PrecompiledHeader>\r
+ </ClCompile>\r
+ </ItemGroup>\r
+ <ItemGroup>\r
+ <ResourceCompile Include="Sample.rc" />\r
+ </ItemGroup>\r
+ <ItemGroup>\r
+ <ClInclude Include="..\editlib\ccrystaleditview.h" />\r
+ <ClInclude Include="..\editlib\ccrystaltextbuffer.h" />\r
+ <ClInclude Include="..\editlib\ccrystaltextmarkers.h" />\r
+ <ClInclude Include="..\editlib\ccrystaltextview.h" />\r
+ <ClInclude Include="..\editlib\ceditreplacedlg.h" />\r
+ <ClInclude Include="..\editlib\cfindtextdlg.h" />\r
+ <ClInclude Include="..\editlib\chcondlg.h" />\r
+ <ClInclude Include="..\editlib\cregexp.h" />\r
+ <ClInclude Include="..\editlib\crystaleditviewex.h" />\r
+ <ClInclude Include="..\editlib\crystalparser.h" />\r
+ <ClInclude Include="..\editlib\crystaltextblock.h" />\r
+ <ClInclude Include="..\editlib\cs2cs.h" />\r
+ <ClInclude Include="..\editlib\editcmd.h" />\r
+ <ClInclude Include="..\editlib\editreg.h" />\r
+ <ClInclude Include="..\editlib\edtlib.h" />\r
+ <ClInclude Include="..\editlib\filesup.h" />\r
+ <ClInclude Include="..\editlib\fpattern.h" />\r
+ <ClInclude Include="..\editlib\gotodlg.h" />\r
+ <ClInclude Include="..\editlib\LineInfo.h" />\r
+ <ClInclude Include="..\editlib\memcombo.h" />\r
+ <ClInclude Include="..\editlib\registry.h" />\r
+ <ClInclude Include="..\editlib\splash.h" />\r
+ <ClInclude Include="..\editlib\statbar.h" />\r
+ <ClInclude Include="..\editlib\string_util.h" />\r
+ <ClInclude Include="..\editlib\SyntaxColors.h" />\r
+ <ClInclude Include="..\editlib\UndoRecord.h" />\r
+ <ClInclude Include="..\editlib\ViewableWhitespace.h" />\r
+ <ClInclude Include="..\editlib\wispelld.h" />\r
+ <ClInclude Include="ChildFrm.h" />\r
+ <ClInclude Include="MainFrm.h" />\r
+ <ClInclude Include="Resource.h" />\r
+ <ClInclude Include="Sample.h" />\r
+ <ClInclude Include="SampleDoc.h" />\r
+ <ClInclude Include="SampleView.h" />\r
+ <ClInclude Include="StdAfx.h" />\r
+ </ItemGroup>\r
+ <ItemGroup>\r
+ <Image Include="res\mg_icons.bmp" />\r
+ <Image Include="res\Sample.ico" />\r
+ <Image Include="res\SampleDoc.ico" />\r
+ <Image Include="res\Toolbar.bmp" />\r
+ </ItemGroup>\r
+ <ItemGroup>\r
+ <None Include="..\editlib\ccrystaleditview.inl" />\r
+ <None Include="..\editlib\ccrystaltextbuffer.inl" />\r
+ <None Include="..\editlib\ccrystaltextview.inl" />\r
+ <None Include="..\editlib\filesup.inl" />\r
+ <None Include="..\editlib\memcombo.inl" />\r
+ <None Include="res\Sample.rc2" />\r
+ </ItemGroup>\r
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+ <ImportGroup Label="ExtensionTargets">\r
+ </ImportGroup>\r
+</Project>
\ No newline at end of file
--- /dev/null
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+ <ItemGroup>\r
+ <Filter Include="Source Files">\r
+ <UniqueIdentifier>{a111cdcd-d8a7-4eaa-83f6-022a52e1fc00}</UniqueIdentifier>\r
+ <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>\r
+ </Filter>\r
+ <Filter Include="Header Files">\r
+ <UniqueIdentifier>{d9b1b540-e846-4e74-aced-59ecf1271360}</UniqueIdentifier>\r
+ <Extensions>h;hpp;hxx;hm;inl</Extensions>\r
+ </Filter>\r
+ <Filter Include="Resource Files">\r
+ <UniqueIdentifier>{186c8202-004c-46d6-852e-78a00d619b21}</UniqueIdentifier>\r
+ <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>\r
+ </Filter>\r
+ <Filter Include="editlib">\r
+ <UniqueIdentifier>{301e27a4-1572-46c0-85b0-8e6e10fbc56f}</UniqueIdentifier>\r
+ </Filter>\r
+ <Filter Include="editlib\parsers">\r
+ <UniqueIdentifier>{0fd2d655-aedc-48db-a5a1-7b0906cbe645}</UniqueIdentifier>\r
+ </Filter>\r
+ </ItemGroup>\r
+ <ItemGroup>\r
+ <ClCompile Include="ChildFrm.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="MainFrm.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="Sample.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="SampleDoc.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="SampleView.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="StdAfx.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\ccrystaleditview.cpp">\r
+ <Filter>editlib</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\ccrystaltextbuffer.cpp">\r
+ <Filter>editlib</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\ccrystaltextview.cpp">\r
+ <Filter>editlib</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\ccrystaltextview2.cpp">\r
+ <Filter>editlib</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\ceditreplacedlg.cpp">\r
+ <Filter>editlib</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\cfindtextdlg.cpp">\r
+ <Filter>editlib</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\chcondlg.cpp">\r
+ <Filter>editlib</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\cregexp.cpp">\r
+ <Filter>editlib</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\crystaleditviewex.cpp">\r
+ <Filter>editlib</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\crystalparser.cpp">\r
+ <Filter>editlib</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\crystaltextblock.cpp">\r
+ <Filter>editlib</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\cs2cs.cpp">\r
+ <Filter>editlib</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\edtlib.cpp">\r
+ <Filter>editlib</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\filesup.cpp">\r
+ <Filter>editlib</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\fpattern.cpp">\r
+ <Filter>editlib</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\gotodlg.cpp">\r
+ <Filter>editlib</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\LineInfo.cpp">\r
+ <Filter>editlib</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\memcombo.cpp">\r
+ <Filter>editlib</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\registry.cpp">\r
+ <Filter>editlib</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\splash.cpp">\r
+ <Filter>editlib</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\statbar.cpp">\r
+ <Filter>editlib</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\string_util.cpp">\r
+ <Filter>editlib</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\SyntaxColors.cpp">\r
+ <Filter>editlib</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\UndoRecord.cpp">\r
+ <Filter>editlib</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\ViewableWhitespace.cpp">\r
+ <Filter>editlib</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\asp.cpp">\r
+ <Filter>editlib\parsers</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\basic.cpp">\r
+ <Filter>editlib\parsers</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\batch.cpp">\r
+ <Filter>editlib\parsers</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\cplusplus.cpp">\r
+ <Filter>editlib\parsers</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\csharp.cpp">\r
+ <Filter>editlib\parsers</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\css.cpp">\r
+ <Filter>editlib\parsers</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\dcl.cpp">\r
+ <Filter>editlib\parsers</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\fortran.cpp">\r
+ <Filter>editlib\parsers</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\html.cpp">\r
+ <Filter>editlib\parsers</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\ini.cpp">\r
+ <Filter>editlib\parsers</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\innosetup.cpp">\r
+ <Filter>editlib\parsers</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\is.cpp">\r
+ <Filter>editlib\parsers</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\java.cpp">\r
+ <Filter>editlib\parsers</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\lisp.cpp">\r
+ <Filter>editlib\parsers</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\nsis.cpp">\r
+ <Filter>editlib\parsers</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\pascal.cpp">\r
+ <Filter>editlib\parsers</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\perl.cpp">\r
+ <Filter>editlib\parsers</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\php.cpp">\r
+ <Filter>editlib\parsers</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\po.cpp">\r
+ <Filter>editlib\parsers</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\powershell.cpp">\r
+ <Filter>editlib\parsers</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\python.cpp">\r
+ <Filter>editlib\parsers</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\rexx.cpp">\r
+ <Filter>editlib\parsers</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\rsrc.cpp">\r
+ <Filter>editlib\parsers</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\ruby.cpp">\r
+ <Filter>editlib\parsers</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\sgml.cpp">\r
+ <Filter>editlib\parsers</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\sh.cpp">\r
+ <Filter>editlib\parsers</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\siod.cpp">\r
+ <Filter>editlib\parsers</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\sql.cpp">\r
+ <Filter>editlib\parsers</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\tcl.cpp">\r
+ <Filter>editlib\parsers</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\tex.cpp">\r
+ <Filter>editlib\parsers</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\verilog.cpp">\r
+ <Filter>editlib\parsers</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\xml.cpp">\r
+ <Filter>editlib\parsers</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\rust.cpp">\r
+ <Filter>editlib\parsers</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\go.cpp">\r
+ <Filter>editlib\parsers</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\editlib\ccrystaltextmarkers.cpp">\r
+ <Filter>editlib</Filter>\r
+ </ClCompile>\r
+ </ItemGroup>\r
+ <ItemGroup>\r
+ <ResourceCompile Include="Sample.rc">\r
+ <Filter>Source Files</Filter>\r
+ </ResourceCompile>\r
+ </ItemGroup>\r
+ <ItemGroup>\r
+ <ClInclude Include="ChildFrm.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="MainFrm.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="Resource.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="Sample.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="SampleDoc.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="SampleView.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="StdAfx.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\editlib\ccrystaleditview.h">\r
+ <Filter>editlib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\editlib\ccrystaltextbuffer.h">\r
+ <Filter>editlib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\editlib\ccrystaltextview.h">\r
+ <Filter>editlib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\editlib\ceditreplacedlg.h">\r
+ <Filter>editlib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\editlib\cfindtextdlg.h">\r
+ <Filter>editlib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\editlib\chcondlg.h">\r
+ <Filter>editlib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\editlib\cregexp.h">\r
+ <Filter>editlib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\editlib\crystaleditviewex.h">\r
+ <Filter>editlib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\editlib\crystalparser.h">\r
+ <Filter>editlib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\editlib\crystaltextblock.h">\r
+ <Filter>editlib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\editlib\cs2cs.h">\r
+ <Filter>editlib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\editlib\editcmd.h">\r
+ <Filter>editlib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\editlib\editreg.h">\r
+ <Filter>editlib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\editlib\edtlib.h">\r
+ <Filter>editlib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\editlib\filesup.h">\r
+ <Filter>editlib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\editlib\fpattern.h">\r
+ <Filter>editlib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\editlib\gotodlg.h">\r
+ <Filter>editlib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\editlib\LineInfo.h">\r
+ <Filter>editlib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\editlib\memcombo.h">\r
+ <Filter>editlib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\editlib\registry.h">\r
+ <Filter>editlib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\editlib\splash.h">\r
+ <Filter>editlib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\editlib\statbar.h">\r
+ <Filter>editlib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\editlib\string_util.h">\r
+ <Filter>editlib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\editlib\SyntaxColors.h">\r
+ <Filter>editlib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\editlib\UndoRecord.h">\r
+ <Filter>editlib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\editlib\ViewableWhitespace.h">\r
+ <Filter>editlib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\editlib\wispelld.h">\r
+ <Filter>editlib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\editlib\ccrystaltextmarkers.h">\r
+ <Filter>editlib</Filter>\r
+ </ClInclude>\r
+ </ItemGroup>\r
+ <ItemGroup>\r
+ <Image Include="res\mg_icons.bmp">\r
+ <Filter>Resource Files</Filter>\r
+ </Image>\r
+ <Image Include="res\Sample.ico">\r
+ <Filter>Resource Files</Filter>\r
+ </Image>\r
+ <Image Include="res\SampleDoc.ico">\r
+ <Filter>Resource Files</Filter>\r
+ </Image>\r
+ <Image Include="res\Toolbar.bmp">\r
+ <Filter>Resource Files</Filter>\r
+ </Image>\r
+ </ItemGroup>\r
+ <ItemGroup>\r
+ <None Include="res\Sample.rc2">\r
+ <Filter>Resource Files</Filter>\r
+ </None>\r
+ <None Include="..\editlib\ccrystaleditview.inl">\r
+ <Filter>editlib</Filter>\r
+ </None>\r
+ <None Include="..\editlib\ccrystaltextbuffer.inl">\r
+ <Filter>editlib</Filter>\r
+ </None>\r
+ <None Include="..\editlib\ccrystaltextview.inl">\r
+ <Filter>editlib</Filter>\r
+ </None>\r
+ <None Include="..\editlib\filesup.inl">\r
+ <Filter>editlib</Filter>\r
+ </None>\r
+ <None Include="..\editlib\memcombo.inl">\r
+ <Filter>editlib</Filter>\r
+ </None>\r
+ </ItemGroup>\r
+</Project>
\ No newline at end of file
SetFont(GetDocument()->m_lf);
SetColorContext(GetDocument()->m_pSyntaxColors);
+ SetMarkersContext(GetDocument()->m_pMarkers);
SetWordWrapping(true);
}
case COLORINDEX_HIGHLIGHTTEXT2:
color = RGB (0, 0, 0);
break;
+ case COLORINDEX_MARKERBKGND1:
+ case COLORINDEX_MARKERBKGND2:
+ case COLORINDEX_MARKERBKGND3:
+ case COLORINDEX_MARKERBKGND4:
+ color = RGB (255, 255, 128);
+ break;
default:
// return RGB(255, 0, 0);
color = RGB (128, 0, 0);
//
COLORINDEX_USER1,
COLORINDEX_USER2,
+ //
+ COLORINDEX_MARKERBKGND1,
+ COLORINDEX_MARKERBKGND2,
+ COLORINDEX_MARKERBKGND3,
+ COLORINDEX_MARKERBKGND4,
// ...
// Expandable: custom elements are allowed.
COLORINDEX_LAST, // Please keep this as last item (not counting masks or
--- /dev/null
+/**
+ * @file ccrystaltextmarkers.cpp
+ *
+ * @brief Imprementation file for CCrystalTextMarkers.
+ */
+#pragma once
+
+#include "stdafx.h"
+#include "ccrystaltextmarkers.h"
+#include "ccrystaltextview.h"
+
+CCrystalTextMarkers::CCrystalTextMarkers() :
+ m_enabled(true)
+{
+}
+
+CCrystalTextMarkers::~CCrystalTextMarkers()
+{
+}
+
+bool CCrystalTextMarkers::SetMarker(const TCHAR *pKey, const CString& sFindWhat, DWORD dwFlags, enum COLORINDEX nBgColorIndex)
+{
+ Marker marker = { sFindWhat, dwFlags, nBgColorIndex };
+ m_markers.insert_or_assign(pKey, marker);
+ return true;
+}
+
+void CCrystalTextMarkers::DeleteMarker(const TCHAR *pKey)
+{
+ m_markers.erase(pKey);
+}
+
+void CCrystalTextMarkers::DeleteAllMarker()
+{
+ m_markers.clear();
+}
+
+void CCrystalTextMarkers::AddView(CCrystalTextView *pView)
+{
+ m_views.push_back(pView);
+}
+
+void CCrystalTextMarkers::DeleteView(CCrystalTextView *pView)
+{
+ auto it = std::find(m_views.begin(), m_views.end(), pView);
+ if (it != m_views.end())
+ m_views.erase(it);
+}
+
+void CCrystalTextMarkers::UpdateViews()
+{
+ for (auto& pView : m_views)
+ pView->UpdateView(nullptr, nullptr, 0, -1);
+}
--- /dev/null
+/**
+ * @file ccrystaltextmarkers.h
+ *
+ * @brief Declaration file for CCrystalTextMarkers.
+ */
+#pragma once
+
+#include <vector>
+#include <map>
+#include "SyntaxColors.h"
+
+class CCrystalTextView;
+
+class CCrystalTextMarkers
+{
+public:
+ struct Marker
+ {
+ CString sFindWhat;
+ DWORD dwFlags;
+ enum COLORINDEX nBgColorIndex;
+ };
+
+ CCrystalTextMarkers();
+ ~CCrystalTextMarkers();
+
+ bool SetMarker(const TCHAR *pKey, const CString& sFindWhat, DWORD dwFlags, enum COLORINDEX nBgColorIndex);
+ void DeleteMarker(const TCHAR *pKey);
+ void DeleteAllMarker();
+ void AddView(CCrystalTextView *pView);
+ void DeleteView(CCrystalTextView *pView);
+ void UpdateViews();
+ void SetEnabled(bool enabled) { m_enabled = enabled; };
+ bool GetEnabled() const { return m_enabled; };
+ const std::map<const TCHAR *, Marker>& GetMarkers() const { return m_markers; }
+ std::map<const TCHAR *, Marker>& GetMarkers() { return m_markers; }
+
+private:
+ std::map<const TCHAR *, Marker> m_markers;
+ std::vector<CCrystalTextView *> m_views;
+ bool m_enabled;
+};
#include "gotodlg.h"
#include "ViewableWhitespace.h"
#include "SyntaxColors.h"
+#include "ccrystaltextmarkers.h"
#include "string_util.h"
using std::vector;
HINSTANCE CCrystalTextView::s_hResourceInst = NULL;
+static int FindStringHelper(LPCTSTR pszFindWhere, LPCTSTR pszFindWhat, DWORD dwFlags, int &nLen, RxNode *&rxnode, RxMatchRes *rxmatch);
+
BEGIN_MESSAGE_MAP (CCrystalTextView, CView)
//{{AFX_MSG_MAP(CCrystalTextView)
ON_WM_DESTROY ()
delete m_pnActualLineLength;
m_pnActualLineLength = NULL;
delete m_pIcons;
+ if (m_pMarkers)
+ m_pMarkers->DeleteView(this);
}
BOOL CCrystalTextView::
}
std::vector<CCrystalTextView::TEXTBLOCK>
+CCrystalTextView::GetMarkerTextBlocks(int nLineIndex) const
+{
+ std::vector<TEXTBLOCK> allblocks;
+ if (!m_pMarkers->GetEnabled())
+ return allblocks;
+
+ int nLength = GetViewableLineLength (nLineIndex);
+
+ for (const auto& marker : m_pMarkers->GetMarkers())
+ {
+ int nBlocks = 0;
+ std::vector<TEXTBLOCK> blocks((nLength + 1) * 3); // be aware of nLength == 0
+ blocks[0].m_nCharPos = 0;
+ blocks[0].m_nColorIndex = COLORINDEX_NONE;
+ blocks[0].m_nBgColorIndex = COLORINDEX_NONE;
+ ++nBlocks;
+ const TCHAR *pszChars = GetLineChars(nLineIndex);
+ if (pszChars)
+ {
+ for (const TCHAR *p = pszChars; ; )
+ {
+ RxNode *node = nullptr;
+ RxMatchRes matches;
+ int nMatchLen = 0;
+ int nPos = ::FindStringHelper(p, marker.second.sFindWhat, marker.second.dwFlags | FIND_NO_WRAP, nMatchLen, node, &matches);
+ if (nPos == -1)
+ break;
+ blocks[nBlocks].m_nCharPos = static_cast<int>(p - pszChars) + nPos;
+ blocks[nBlocks].m_nBgColorIndex = marker.second.nBgColorIndex | COLORINDEX_APPLYFORCE;
+ blocks[nBlocks].m_nColorIndex = COLORINDEX_NONE;
+ ++nBlocks;
+ blocks[nBlocks].m_nCharPos = static_cast<int>(p - pszChars) + nPos + nMatchLen;
+ blocks[nBlocks].m_nBgColorIndex = COLORINDEX_NONE;
+ blocks[nBlocks].m_nColorIndex = COLORINDEX_NONE;
+ ++nBlocks;
+ p += nPos + nMatchLen;
+ }
+ blocks.resize(nBlocks);
+ allblocks = MergeTextBlocks(allblocks, blocks);
+ }
+ }
+
+ return allblocks;
+}
+
+std::vector<CCrystalTextView::TEXTBLOCK>
CCrystalTextView::GetTextBlocks(int nLineIndex)
{
int nLength = GetViewableLineLength (nLineIndex);
ASSERT((*m_ParseCookies)[nLineIndex] != -1);
blocks.resize(nBlocks);
- return MergeTextBlocks(blocks, GetAdditionalTextBlocks(nLineIndex));
+ return MergeTextBlocks(blocks,
+ (m_pMarkers && m_pMarkers->GetEnabled() && m_pMarkers->GetMarkers().size() > 0) ?
+ MergeTextBlocks(GetAdditionalTextBlocks(nLineIndex), GetMarkerTextBlocks(nLineIndex)) :
+ GetAdditionalTextBlocks(nLineIndex));
}
void CCrystalTextView::
FindText (LPCTSTR pszText, const CPoint & ptStartPos, DWORD dwFlags,
bool bWrapSearch, CPoint * pptFoundPos)
{
+ if (m_pMarkers)
+ {
+ m_pMarkers->SetMarker(_T("EDITOR_MARKER"), pszText, dwFlags, COLORINDEX_MARKERBKGND1);
+ if (m_pMarkers->GetEnabled())
+ m_pMarkers->UpdateViews();
+ }
int nLineCount = GetLineCount ();
return FindTextInBlock (pszText, ptStartPos, CPoint (0, 0),
CPoint (GetLineLength (nLineCount - 1), nLineCount - 1),
return m_pTextBuffer->GetLineEol(nLine);
}
+void CCrystalTextView::SetMarkersContext(CCrystalTextMarkers * pMarkers)
+{
+ pMarkers->AddView(this);
+ m_pMarkers = pMarkers;
+}
+
#ifdef _UNICODE
int CCrystalTextView::GetCharWidthUnicodeChar(wchar_t ch)
{
class SyntaxColors;
class CFindTextDlg;
struct LastSearchInfos;
-
+class CCrystalTextMarkers;
////////////////////////////////////////////////////////////////////////////
// CCrystalTextView class declaration
int m_nScreenLines, m_nScreenChars;
SyntaxColors * m_pColors;
+ CCrystalTextMarkers * m_pMarkers;
//BEGIN SW
/**
SyntaxColors * GetSyntaxColors() { return m_pColors; }
void SetColorContext(SyntaxColors * pColors) { m_pColors = pColors; }
-
+ CCrystalTextMarkers * GetMarkers() const { return m_pMarkers; }
+ void SetMarkersContext(CCrystalTextMarkers * pMarkers);
static int GetClipTcharTextFormat() { return sizeof(TCHAR) == 1 ? CF_TEXT : CF_UNICODETEXT; }
protected :
//END SW
std::vector<TEXTBLOCK> MergeTextBlocks(const std::vector<TEXTBLOCK>& blocks1, const std::vector<TEXTBLOCK>& blocks2) const;
+ std::vector<TEXTBLOCK> GetMarkerTextBlocks(int nLineIndex) const;
virtual std::vector<TEXTBLOCK> GetAdditionalTextBlocks (int nLineIndex);
public:
#include "editcmd.h"
#include "ccrystaltextview.h"
#include "ccrystaltextbuffer.h"
+#include "SyntaxColors.h"
+#include "ccrystaltextmarkers.h"
#include <malloc.h>
#include "string_util.h"
EnsureVisible (m_ptCursorPos);
SetSelection (ptStart, ptEnd);
+ const TCHAR *pszChars = GetLineChars(ptStart.y);
+ if (m_pMarkers && ptEnd.x - ptStart.x > 0)
+ {
+ m_pMarkers->SetMarker(_T("EDITOR_MARKER"), CString(pszChars + ptStart.x, ptEnd.x - ptStart.x), FIND_MATCH_CASE | FIND_WHOLE_WORD, COLORINDEX_MARKERBKGND1);
+ if (m_pMarkers->GetEnabled())
+ m_pMarkers->UpdateViews();
+ }
+
SetCapture ();
m_nDragSelTimer = SetTimer (CRYSTAL_TIMER_DRAGSEL, 100, NULL);
ASSERT (m_nDragSelTimer != 0);
}
}
- return (result >= 0);
+ return (result > 0);
}
#define FLAG_UP_CASE 1
, m_pSyntaxColors(colors)
, m_pageTextColors(regOptions, colors)
, m_pageSyntaxColors(regOptions, colors)
+, m_pageMarkerColors(regOptions, colors)
, m_pageArchive(regOptions)
, m_pageCodepage(regOptions)
, m_pageEditor(regOptions)
AddPage(&m_pageMergeColors, IDS_OPTIONSPG_COLORS, IDS_OPTIONSPG_MERGECOLORS);
AddPage(&m_pageSyntaxColors, IDS_OPTIONSPG_COLORS, IDS_OPTIONSPG_SYNTAXCOLORS);
AddPage(&m_pageTextColors, IDS_OPTIONSPG_COLORS, IDS_OPTIONSPG_TEXTCOLORS);
+ AddPage(&m_pageMarkerColors, IDS_OPTIONSPG_COLORS, IDS_OPTIONSPG_MARKERCOLORS);
AddPage(&m_pageArchive, IDS_OPTIONSPG_ARCHIVE);
AddPage(&m_pageSystem, IDS_OPTIONSPG_SYSTEM);
AddPage(&m_pageBackups, IDS_OPTIONSPG_BACKUPS);
m_pageMergeColors.ReadOptions();
m_pageTextColors.ReadOptions();
m_pageSyntaxColors.ReadOptions();
+ m_pageMarkerColors.ReadOptions();
m_pageSystem.ReadOptions();
m_pageCompare.ReadOptions();
m_pageCompareFolder.ReadOptions();
SafeUpdatePage(&m_pageMergeColors, FALSE);
SafeUpdatePage(&m_pageTextColors, FALSE);
SafeUpdatePage(&m_pageSyntaxColors, FALSE);
+ SafeUpdatePage(&m_pageMarkerColors, FALSE);
SafeUpdatePage(&m_pageSystem, FALSE);
SafeUpdatePage(&m_pageCompare, FALSE);
SafeUpdatePage(&m_pageCompareFolder, FALSE);
m_pageMergeColors.WriteOptions();
m_pageTextColors.WriteOptions();
m_pageSyntaxColors.WriteOptions();
+ m_pageMarkerColors.WriteOptions();
m_pageCodepage.WriteOptions();
m_pageVss.WriteOptions();
m_pageArchive.WriteOptions();
#include "PropColors.h"
#include "PropTextColors.h"
#include "PropSyntaxColors.h"
+#include "PropMarkerColors.h"
#include "PropCodepage.h"
#include "PropArchive.h"
#include "PropBackups.h"
PropMergeColors m_pageMergeColors;
PropTextColors m_pageTextColors;
PropSyntaxColors m_pageSyntaxColors;
+ PropMarkerColors m_pageMarkerColors;
PropArchive m_pageArchive;
PropBackups m_pageBackups;
PropShell m_pageShell;
#include "LanguageSelect.h"
#include "version.h"
#include "Bitmap.h"
+#include "CCrystalTextMarkers.h"
using std::vector;
using boost::begin;
strdiff::SetBreakChars(GetOptionsMgr()->GetString(OPT_BREAK_SEPARATORS).c_str());
+ theApp.GetMainMarkers()->SetEnabled(GetOptionsMgr()->GetBool(OPT_MARKER_ENABLED));
+
// make an attempt at rescanning any open diff sessions
ApplyDiffOptions();
#include "LineFiltersList.h"
#include "FilterCommentsManager.h"
#include "SyntaxColors.h"
+#include "CCrystalTextMarkers.h"
#include "OptionsSyntaxColors.h"
#include "Plugins.h"
#include "ProjectFile.h"
, m_pLineFilters(new LineFiltersList())
, m_pFilterCommentsManager(new FilterCommentsManager())
, m_pSyntaxColors(new SyntaxColors())
+, m_pMarkers(new CCrystalTextMarkers())
, m_pSourceControl(new SourceControl())
, m_bMergingMode(FALSE)
{
class COptionsMgr;
class LineFiltersList;
class SyntaxColors;
+class CCrystalTextMarkers;
class SourceControl;
class FilterCommentsManager;
std::unique_ptr<CLanguageSelect> m_pLangDlg;
std::unique_ptr<FileFilterHelper> m_pGlobalFileFilter;
std::unique_ptr<SyntaxColors> m_pSyntaxColors; /**< Syntax color container */
+ std::unique_ptr<CCrystalTextMarkers> m_pMarkers; /**< Marker container */
std::unique_ptr<SourceControl> m_pSourceControl;
String m_strSaveAsPath; /**< "3rd path" where output saved if given */
BOOL m_bEscShutdown; /**< If commandline switch -e given ESC closes appliction */
SyntaxColors * GetMainSyntaxColors() { return m_pSyntaxColors.get(); }
+ CCrystalTextMarkers * GetMainMarkers() const { return m_pMarkers.get(); }
BOOL m_bClearCaseTool; /**< WinMerge is executed as an external Rational ClearCase compare/merge tool. */
MergeCmdLineInfo::ExitNoDiff m_bExitIfNoDiff; /**< Exit if files are identical? */
std::unique_ptr<LineFiltersList> m_pLineFilters; /**< List of linefilters */
COMBOBOX IDC_CUSTOM_CP_NUMBER,96,67,122,130,CBS_DROPDOWN | WS_VSCROLL | WS_GROUP | WS_TABSTOP\r
END\r
\r
-IDD_PREFERENCES DIALOGEX 0, 0, 352, 260\r
+IDD_PREFERENCES DIALOGEX 0, 0, 352, 280\r
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
CAPTION "Options"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
- DEFPUSHBUTTON "OK",IDOK,187,237,50,14\r
- PUSHBUTTON "Cancel",IDCANCEL,241,237,50,14\r
- PUSHBUTTON "Help",IDC_TREEOPT_HELP,295,237,50,14\r
- CONTROL "",IDC_TREEOPT_PAGES,"SysTreeView32",TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,20,96,202\r
- CONTROL "",IDC_TREEOPT_HOSTFRAME,"Static",SS_BLACKFRAME | NOT WS_VISIBLE | WS_DISABLED,110,0,235,222\r
- CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,230,338,1\r
+ DEFPUSHBUTTON "OK",IDOK,187,257,50,14\r
+ PUSHBUTTON "Cancel",IDCANCEL,241,257,50,14\r
+ PUSHBUTTON "Help",IDC_TREEOPT_HELP,295,257,50,14\r
+ CONTROL "",IDC_TREEOPT_PAGES,"SysTreeView32",TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,20,96,222\r
+ CONTROL "",IDC_TREEOPT_HOSTFRAME,"Static",SS_BLACKFRAME | NOT WS_VISIBLE | WS_DISABLED,110,0,235,242\r
+ CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,250,338,1\r
LTEXT " Categories",IDC_STATIC,7,7,96,13,SS_CENTERIMAGE | SS_SUNKEN\r
- PUSHBUTTON "Import...",IDC_TREEOPT_IMPORT,7,237,50,14\r
- PUSHBUTTON "Export...",IDC_TREEOPT_EXPORT,62,237,50,14\r
+ PUSHBUTTON "Import...",IDC_TREEOPT_IMPORT,7,257,50,14\r
+ PUSHBUTTON "Export...",IDC_TREEOPT_EXPORT,62,257,50,14\r
END\r
\r
IDD_PROPPAGE_COLORS_SYNTAX DIALOGEX 0, 0, 235, 214\r
PUSHBUTTON "Defaults",IDC_SCOLORS_BDEFAULTS,162,198,70,14\r
END\r
\r
+IDD_PROPPAGE_COLORS_MARKER DIALOGEX 0, 0, 197, 157\r
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
+CAPTION "Dialog"\r
+FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
+BEGIN\r
+ CONTROL "&Enable marker",IDC_MARKER_ENABLED,\r
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,14,161,10\r
+ GROUPBOX "Marker colors",IDC_MARKER_COLORS_GROUP,27,33,159,111\r
+ LTEXT "Search Marker:",IDC_MARKER0_COLOR_LABEL,30,60,66,10\r
+ LTEXT "User Defined Marker1:",IDC_MARKER1_COLOR_LABEL,30,78,79,10\r
+ LTEXT "User Defined Marker2:",IDC_MARKER2_COLOR_LABEL,30,96,79,10\r
+ LTEXT "User Defined Marker3:",IDC_MARKER3_COLOR_LABEL,30,114,79,10\r
+ CTEXT "Background",IDC_BACKGROUND_COLUMN_LABEL,96,44,50,10\r
+ CONTROL "",IDC_MARKER0_BKGD_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,113,60,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
+ CONTROL "",IDC_MARKER1_BKGD_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,113,78,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
+ CONTROL "",IDC_MARKER2_BKGD_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,113,96,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
+ CONTROL "",IDC_MARKER3_BKGD_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,113,114,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
+END\r
+\r
IDD_DIRCMP_REPORT DIALOGEX 0, 0, 268, 97\r
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
CAPTION "Folder Compare Report"\r
PUSHBUTTON "&Hex View",IDC_HEXVIEW,261,29,120,14\r
END\r
\r
-\r
/////////////////////////////////////////////////////////////////////////////\r
//\r
// DESIGNINFO\r
IDD_DIRCOMP_PROGRESS, DIALOG\r
BEGIN\r
END\r
+\r
+ IDD_PROPPAGE_COLORS_MARKER, DIALOG\r
+ BEGIN\r
+ END\r
END\r
#endif // APSTUDIO_INVOKED\r
\r
0, 0, 0, 0\r
END\r
\r
+IDD_PROPPAGE_COLORS_MARKER AFX_DIALOG_LAYOUT\r
+BEGIN\r
+ 0\r
+END\r
+\r
\r
/////////////////////////////////////////////////////////////////////////////\r
//\r
IDS_OPTIONSPG_COLORS "Colors"\r
IDS_OPTIONSPG_TEXTCOLORS "Text"\r
IDS_OPTIONSPG_SYNTAXCOLORS "Syntax"\r
+ IDS_OPTIONSPG_MARKERCOLORS "Markers"\r
IDS_OPTIONSPG_SYSTEM "System"\r
IDS_OPTIONSPG_VERSIONCONTROL "Version Control"\r
IDS_OPTIONSPG_CODEPAGE "Codepage"\r
<ClCompile Include="..\Externals\crystaledit\editlib\batch.cpp" />\r
<ClCompile Include="..\Externals\crystaledit\editlib\ccrystaleditview.cpp" />\r
<ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.cpp" />\r
<ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview.cpp" />\r
<ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview2.cpp" />\r
<ClCompile Include="..\Externals\crystaledit\editlib\ceditreplacedlg.cpp" />\r
<ClCompile Include="PropEditor.cpp" />\r
<ClCompile Include="Common\PropertyPageHost.cpp" />\r
<ClCompile Include="PropGeneral.cpp" />\r
+ <ClCompile Include="PropMarkerColors.cpp" />\r
<ClCompile Include="PropRegistry.cpp" />\r
<ClCompile Include="PropShell.cpp" />\r
<ClCompile Include="PropSyntaxColors.cpp" />\r
<ItemGroup>\r
<ClInclude Include="..\Externals\crystaledit\editlib\ccrystaleditview.h" />\r
<ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.h" />\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.h" />\r
<ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextview.h" />\r
<ClInclude Include="..\Externals\crystaledit\editlib\ceditreplacedlg.h" />\r
<ClInclude Include="..\Externals\crystaledit\editlib\cfindtextdlg.h" />\r
<ClInclude Include="PropEditor.h" />\r
<ClInclude Include="Common\PropertyPageHost.h" />\r
<ClInclude Include="PropGeneral.h" />\r
+ <ClInclude Include="PropMarkerColors.h" />\r
<ClInclude Include="PropRegistry.h" />\r
<ClInclude Include="PropShell.h" />\r
<ClInclude Include="PropSyntaxColors.h" />\r
<ClCompile Include="..\Externals\crystaledit\editlib\rust.cpp">\r
<Filter>EditLib\parsers</Filter>\r
</ClCompile>\r
+ <ClCompile Include="PropMarkerColors.cpp">\r
+ <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+ </ClCompile>\r
</ItemGroup>\r
<ItemGroup>\r
<ClInclude Include="charsets.h">\r
<ClInclude Include="TestMain.h">\r
<Filter>MFCGui\Header Files</Filter>\r
</ClInclude>\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.h">\r
+ <Filter>EditLib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="PropMarkerColors.h">\r
+ <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+ </ClInclude>\r
</ItemGroup>\r
<ItemGroup>\r
<None Include="res\binarydiff.ico">\r
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="UnicodeDebug|Win32">
- <Configuration>UnicodeDebug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="UnicodeDebug|x64">
- <Configuration>UnicodeDebug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="UnicodeRelease|Win32">
- <Configuration>UnicodeRelease</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="UnicodeRelease|x64">
- <Configuration>UnicodeRelease</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectName>Merge</ProjectName>
- <ProjectGuid>{9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}</ProjectGuid>
- <RootNamespace>Merge</RootNamespace>
- <Keyword>MFCProj</Keyword>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>Static</UseOfMfc>
- <CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v140_xp</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>Static</UseOfMfc>
- <CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v140_xp</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>Static</UseOfMfc>
- <CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v140_xp</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>Static</UseOfMfc>
- <CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v140_xp</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">.\..\Build\Merge$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">.\..\BuildTmp\Merge$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">.\..\Build\$(Platform)\Merge$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">.\..\BuildTmp\$(Platform)\Merge$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">false</LinkIncremental>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">true</EmbedManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">.\..\Build\Merge$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">.\..\BuildTmp\Merge$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">.\..\Build\$(Platform)\Merge$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">.\..\BuildTmp\$(Platform)\Merge$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">true</LinkIncremental>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">true</EmbedManifest>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">Win$(ProjectName)U</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">Win$(ProjectName)U</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Win$(ProjectName)U</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">Win$(ProjectName)U</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <AdditionalOptions>/EHa %(AdditionalOptions)</AdditionalOptions>
- <Optimization>MinSpace</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <RuntimeTypeInfo>true</RuntimeTypeInfo>
- <PrecompiledHeader>Use</PrecompiledHeader>
- <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <ExceptionHandling>Async</ExceptionHandling>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>/verbose:lib %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)/WinMergeU.exe</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\Externals\poco\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>msvcrtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <TargetMachine>MachineX86</TargetMachine>
- <GenerateMapFile>true</GenerateMapFile>
- </Link>
- <PostBuildEvent>
- <Command>
- </Command>
- </PostBuildEvent>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">
- <CustomBuildStep>
- <Command>
- </Command>
- <Outputs>$(TargetDir)WinMergeU.map;%(Outputs)</Outputs>
- </CustomBuildStep>
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>X64</TargetEnvironment>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <AdditionalOptions>/EHa %(AdditionalOptions)</AdditionalOptions>
- <Optimization>MinSpace</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <RuntimeTypeInfo>true</RuntimeTypeInfo>
- <PrecompiledHeader>Use</PrecompiledHeader>
- <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <ExceptionHandling>Async</ExceptionHandling>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>/verbose:lib %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)/WinMergeU.exe</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\Externals\poco\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>msvcrtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <TargetMachine>MachineX64</TargetMachine>
- <GenerateMapFile>true</GenerateMapFile>
- <OptimizeReferences>
- </OptimizeReferences>
- </Link>
- <PostBuildEvent>
- <Command>
- </Command>
- </PostBuildEvent>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <AdditionalOptions>/EHa %(AdditionalOptions)</AdditionalOptions>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <RuntimeTypeInfo>true</RuntimeTypeInfo>
- <PrecompiledHeader>Use</PrecompiledHeader>
- <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
- <BrowseInformation>true</BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <ExceptionHandling>Async</ExceptionHandling>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)/WinMergeU.exe</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\Externals\poco\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <TargetMachine>MachineX86</TargetMachine>
- <GenerateMapFile>true</GenerateMapFile>
- <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
- </Link>
- <PostBuildEvent>
- <Command>
- </Command>
- </PostBuildEvent>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">
- <CustomBuildStep>
- <Command>
- </Command>
- <Outputs>$(TargetDir)WinMergeU.map;%(Outputs)</Outputs>
- </CustomBuildStep>
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>X64</TargetEnvironment>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <AdditionalOptions>/EHa %(AdditionalOptions)</AdditionalOptions>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <RuntimeTypeInfo>true</RuntimeTypeInfo>
- <PrecompiledHeader>Use</PrecompiledHeader>
- <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
- <BrowseInformation>true</BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <ExceptionHandling>Async</ExceptionHandling>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)/WinMergeU.exe</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\Externals\poco\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <TargetMachine>MachineX64</TargetMachine>
- <GenerateMapFile>true</GenerateMapFile>
- <Profile>false</Profile>
- <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
- </Link>
- <PostBuildEvent>
- <Command>
- </Command>
- </PostBuildEvent>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\Externals\crystaledit\editlib\asp.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\basic.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\batch.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaleditview.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview2.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\ceditreplacedlg.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\cfindtextdlg.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\chcondlg.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\cplusplus.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\cregexp_poco.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\crystaleditviewex.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\crystalparser.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\crystaltextblock.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\cs2cs.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\csharp.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\css.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\dcl.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\filesup.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\fortran.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\fpattern.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\go.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\gotodlg.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\html.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\ini.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\innosetup.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\is.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\java.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\LineInfo.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\lisp.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\memcombo.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\nsis.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\pascal.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\perl.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\php.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\po.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\powershell.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\python.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\registry.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\rexx.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\rsrc.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\ruby.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\rust.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\sgml.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\sh.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\siod.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\sql.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\statbar.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\string_util.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\SyntaxColors.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\tcl.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\tex.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\UndoRecord.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\verilog.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\ViewableWhitespace.cpp" />
- <ClCompile Include="..\Externals\crystaledit\editlib\xml.cpp" />
- <ClCompile Include="7zCommon.cpp">
- </ClCompile>
- <ClCompile Include="AboutDlg.cpp">
- </ClCompile>
- <ClCompile Include="Common\BCMenu.cpp" />
- <ClCompile Include="Common\Bitmap.cpp" />
- <ClCompile Include="CCPromptDlg.cpp">
- </ClCompile>
- <ClCompile Include="charsets.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</BrowseInformation>
- <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">true</BrowseInformation>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">MinSpace</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">MinSpace</Optimization>
- </ClCompile>
- <ClCompile Include="ChildFrm.cpp" />
- <ClCompile Include="Common\ClipBoard.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="Common\CMoveConstraint.cpp" />
- <ClCompile Include="codepage_detect.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="Common\ColorButton.cpp" />
- <ClCompile Include="Common\ExConverter.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="CompareEngines\BinaryCompare.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="CompareOptions.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="CompareStatisticsDlg.cpp" />
- <ClCompile Include="CompareStats.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="ConfigLog.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="ConfirmFolderCopyDlg.cpp" />
- <ClCompile Include="ConflictFileParser.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="Common\coretools.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="DropHandler.cpp" />
- <ClCompile Include="ImgMergeFrm.cpp" />
- <ClCompile Include="Merge7zFormatMergePluginImpl.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="Merge7zFormatShellImpl.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="MergeStatusBar.cpp" />
- <ClCompile Include="OptionsDef.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="OptionsCustomColors.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="DiffContext.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="DiffFileData.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="DiffFileInfo.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="DiffItem.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="DiffItemList.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="DiffList.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="DiffTextBuffer.cpp" />
- <ClCompile Include="DiffThread.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="DiffViewBar.cpp" />
- <ClCompile Include="DiffWrapper.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="DirActions.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="DirCmpReport.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="DirCmpReportDlg.cpp" />
- <ClCompile Include="DirColsDlg.cpp" />
- <ClCompile Include="DirCompProgressBar.cpp" />
- <ClCompile Include="DirDoc.cpp" />
- <ClCompile Include="DirFrame.cpp" />
- <ClCompile Include="DirItem.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="DirScan.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="DirTravel.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="DirView.cpp" />
- <ClCompile Include="DirViewColItems.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="dllpstub.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="EditorFilepathBar.cpp" />
- <ClCompile Include="EncodingErrorBar.cpp" />
- <ClCompile Include="Environment.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="FileActionScript.cpp" />
- <ClCompile Include="FileFilter.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="FileFilterHelper.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="FileFilterMgr.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="FileFiltersDlg.cpp" />
- <ClCompile Include="FileOrFolderSelect.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="FilepathEdit.cpp" />
- <ClCompile Include="FileTextEncoding.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="FileTransform.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="FileVersion.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="FilterCommentsManager.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="FilterList.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="FolderCmp.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="GhostTextBuffer.cpp" />
- <ClCompile Include="GhostTextView.cpp" />
- <ClCompile Include="HexMergeDoc.cpp" />
- <ClCompile Include="HexMergeFrm.cpp" />
- <ClCompile Include="HexMergeView.cpp" />
- <ClCompile Include="Common\LanguageSelect.cpp" />
- <ClCompile Include="JumpList.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="LineFiltersDlg.cpp" />
- <ClCompile Include="LineFiltersList.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="LoadSaveCodepageDlg.cpp" />
- <ClCompile Include="locality.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="LocationBar.cpp" />
- <ClCompile Include="LocationView.cpp" />
- <ClCompile Include="Common\lwdisp.c">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="MainFrm.cpp" />
- <ClCompile Include="markdown.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="Common\MDITabBar.cpp" />
- <ClCompile Include="Merge.cpp" />
- <ClCompile Include="MergeApp.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="MergeCmdLineInfo.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="MergeDoc.cpp" />
- <ClCompile Include="MergeDocDiffSync.cpp" />
- <ClCompile Include="MergeDocEncoding.cpp" />
- <ClCompile Include="MergeDocLineDiffs.cpp" />
- <ClCompile Include="MergeEditView.cpp" />
- <ClCompile Include="Common\MessageBoxDialog.cpp" />
- <ClCompile Include="MovedBlocks.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="MovedLines.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="Common\multiformatText.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="OpenDoc.cpp" />
- <ClCompile Include="OpenFrm.cpp" />
- <ClCompile Include="OpenView.cpp" />
- <ClCompile Include="OptionsDiffColors.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="OptionsDiffOptions.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="OptionsFont.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="OptionsInit.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="common\OptionsMgr.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="OptionsPanel.cpp" />
- <ClCompile Include="OptionsSyntaxColors.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="PatchDlg.cpp" />
- <ClCompile Include="PatchHTML.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="PatchTool.cpp" />
- <ClCompile Include="PathContext.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="paths.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="Common\Picture.cpp" />
- <ClCompile Include="Common\PidlContainer.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="PluginManager.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="Plugins.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="PluginsListDlg.cpp" />
- <ClCompile Include="Common\PreferencesDlg.cpp" />
- <ClCompile Include="ProjectFile.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="ProjectFilePathsDlg.cpp" />
- <ClCompile Include="PropArchive.cpp" />
- <ClCompile Include="PropBackups.cpp" />
- <ClCompile Include="PropCodepage.cpp" />
- <ClCompile Include="PropColors.cpp" />
- <ClCompile Include="PropCompare.cpp" />
- <ClCompile Include="PropCompareBinary.cpp" />
- <ClCompile Include="PropCompareFolder.cpp" />
- <ClCompile Include="PropCompareImage.cpp" />
- <ClCompile Include="PropEditor.cpp" />
- <ClCompile Include="Common\PropertyPageHost.cpp" />
- <ClCompile Include="PropGeneral.cpp" />
- <ClCompile Include="PropRegistry.cpp" />
- <ClCompile Include="PropShell.cpp" />
- <ClCompile Include="PropSyntaxColors.cpp" />
- <ClCompile Include="PropTextColors.cpp" />
- <ClCompile Include="PropVss.cpp" />
- <ClCompile Include="Common\RegKey.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="Common\RegOptionsMgr.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="SaveClosingDlg.cpp" />
- <ClCompile Include="Common\scbarcf.cpp" />
- <ClCompile Include="Common\scbarg.cpp" />
- <ClCompile Include="SelectUnpackerDlg.cpp" />
- <ClCompile Include="SharedFilterDlg.cpp" />
- <ClCompile Include="Common\ShellContextMenu.cpp" />
- <ClCompile Include="Common\ShellFileOperations.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="Common\sizecbar.cpp" />
- <ClCompile Include="Common\SortHeaderCtrl.cpp" />
- <ClCompile Include="SourceControl.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="Common\SplitterWndEx.cpp" />
- <ClCompile Include="StdAfx.cpp">
- <PrecompiledHeader>Create</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="stringdiffs.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="Common\SuperComboBox.cpp" />
- <ClCompile Include="TempFile.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="Test.cpp" />
- <ClCompile Include="TestFilterDlg.cpp" />
- <ClCompile Include="Common\unicoder.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="Common\UnicodeString.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="Common\UniFile.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="TestMain.cpp" />
- <ClCompile Include="TrDialogs.cpp" />
- <ClCompile Include="UniMarkdownFile.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="Common\varprop.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="Common\version.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="VSSHelper.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="VssPromptDlg.cpp" />
- <ClCompile Include="WMGotoDlg.cpp" />
- <ClCompile Include="diffutils\src\analyze.c">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="diffutils\lib\cmpbuf.c">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="diffutils\src\context.c">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="diffutils\src\Diff.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="diffutils\src\ed.c">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="diffutils\GnuVersion.c">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="diffutils\src\ifdef.c">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="diffutils\src\io.c">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="diffutils\src\normal.c">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="diffutils\src\side.c">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="diffutils\src\util.c">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="diffutils\src\mystat.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="CompareEngines\ByteComparator.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="CompareEngines\ByteCompare.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="CompareEngines\DiffUtils.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="CompareEngines\TimeSizeCompare.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaleditview.h" />
- <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.h" />
- <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextview.h" />
- <ClInclude Include="..\Externals\crystaledit\editlib\ceditreplacedlg.h" />
- <ClInclude Include="..\Externals\crystaledit\editlib\cfindtextdlg.h" />
- <ClInclude Include="..\Externals\crystaledit\editlib\chcondlg.h" />
- <ClInclude Include="..\Externals\crystaledit\editlib\cregexp.h" />
- <ClInclude Include="..\Externals\crystaledit\editlib\crystaleditviewex.h" />
- <ClInclude Include="..\Externals\crystaledit\editlib\crystalparser.h" />
- <ClInclude Include="..\Externals\crystaledit\editlib\crystaltextblock.h" />
- <ClInclude Include="..\Externals\crystaledit\editlib\cs2cs.h" />
- <ClInclude Include="..\Externals\crystaledit\editlib\editcmd.h" />
- <ClInclude Include="..\Externals\crystaledit\editlib\editreg.h" />
- <ClInclude Include="..\Externals\crystaledit\editlib\edtlib.h" />
- <ClInclude Include="..\Externals\crystaledit\editlib\filesup.h" />
- <ClInclude Include="..\Externals\crystaledit\editlib\fpattern.h" />
- <ClInclude Include="..\Externals\crystaledit\editlib\gotodlg.h" />
- <ClInclude Include="..\Externals\crystaledit\editlib\LineInfo.h" />
- <ClInclude Include="..\Externals\crystaledit\editlib\memcombo.h" />
- <ClInclude Include="..\Externals\crystaledit\editlib\registry.h" />
- <ClInclude Include="..\Externals\crystaledit\editlib\statbar.h" />
- <ClInclude Include="..\Externals\crystaledit\editlib\string_util.h" />
- <ClInclude Include="..\Externals\crystaledit\editlib\SyntaxColors.h" />
- <ClInclude Include="..\Externals\crystaledit\editlib\UndoRecord.h" />
- <ClInclude Include="..\Externals\crystaledit\editlib\ViewableWhitespace.h" />
- <ClInclude Include="..\Externals\crystaledit\editlib\wispelld.h" />
- <ClInclude Include="7zCommon.h" />
- <ClInclude Include="AboutDlg.h" />
- <ClInclude Include="Common\BCMenu.h" />
- <ClInclude Include="Common\Bitmap.h" />
- <ClInclude Include="CCPromptDlg.h" />
- <ClInclude Include="charsets.h" />
- <ClInclude Include="ChildFrm.h" />
- <ClInclude Include="Common\ClipBoard.h" />
- <ClInclude Include="Common\CMoveConstraint.h" />
- <ClInclude Include="codepage_detect.h" />
- <ClInclude Include="Common\ColorButton.h" />
- <ClInclude Include="Common\ExConverter.h" />
- <ClInclude Include="CompareEngines\BinaryCompare.h" />
- <ClInclude Include="CompareOptions.h" />
- <ClInclude Include="CompareStatisticsDlg.h" />
- <ClInclude Include="CompareStats.h" />
- <ClInclude Include="ConfigLog.h" />
- <ClInclude Include="ConfirmFolderCopyDlg.h" />
- <ClInclude Include="ConflictFileParser.h" />
- <ClInclude Include="Common\coretools.h" />
- <ClInclude Include="Common\coretypes.h" />
- <ClInclude Include="Constants.h" />
- <ClInclude Include="DirActions.h" />
- <ClInclude Include="HexMergeView.h" />
- <ClInclude Include="DropHandler.h" />
- <ClInclude Include="IMergeDoc.h" />
- <ClInclude Include="ImgMergeFrm.h" />
- <ClInclude Include="Merge7zFormatMergePluginImpl.h" />
- <ClInclude Include="Merge7zFormatRegister.h" />
- <ClInclude Include="Merge7zFormatShellImpl.h" />
- <ClInclude Include="MergeStatusBar.h" />
- <ClInclude Include="OptionsCustomColors.h" />
- <ClInclude Include="Diff3.h" />
- <ClInclude Include="DiffContext.h" />
- <ClInclude Include="DiffFileData.h" />
- <ClInclude Include="DiffFileInfo.h" />
- <ClInclude Include="DiffItem.h" />
- <ClInclude Include="DiffItemList.h" />
- <ClInclude Include="DiffList.h" />
- <ClInclude Include="DiffTextBuffer.h" />
- <ClInclude Include="DiffThread.h" />
- <ClInclude Include="DiffViewBar.h" />
- <ClInclude Include="DiffWrapper.h" />
- <ClInclude Include="DirCmpReport.h" />
- <ClInclude Include="DirCmpReportDlg.h" />
- <ClInclude Include="DirColsDlg.h" />
- <ClInclude Include="DirCompProgressBar.h" />
- <ClInclude Include="DirDoc.h" />
- <ClInclude Include="DirFrame.h" />
- <ClInclude Include="DirItem.h" />
- <ClInclude Include="DirReportTypes.h" />
- <ClInclude Include="DirScan.h" />
- <ClInclude Include="DirTravel.h" />
- <ClInclude Include="DirView.h" />
- <ClInclude Include="DirViewColItems.h" />
- <ClInclude Include="dllpstub.h" />
- <ClInclude Include="EditorFilepathBar.h" />
- <ClInclude Include="EncodingErrorBar.h" />
- <ClInclude Include="Environment.h" />
- <ClInclude Include="Exceptions.h" />
- <ClInclude Include="FileActionScript.h" />
- <ClInclude Include="FileFilter.h" />
- <ClInclude Include="FileFilterHelper.h" />
- <ClInclude Include="FileFilterMgr.h" />
- <ClInclude Include="FileFiltersDlg.h" />
- <ClInclude Include="FileLocation.h" />
- <ClInclude Include="FileOrFolderSelect.h" />
- <ClInclude Include="FilepathEdit.h" />
- <ClInclude Include="files.h" />
- <ClInclude Include="FileTextEncoding.h" />
- <ClInclude Include="FileTextStats.h" />
- <ClInclude Include="FileTransform.h" />
- <ClInclude Include="FileVersion.h" />
- <ClInclude Include="FilterCommentsManager.h" />
- <ClInclude Include="FilterList.h" />
- <ClInclude Include="FolderCmp.h" />
- <ClInclude Include="GhostTextBuffer.h" />
- <ClInclude Include="GhostTextView.h" />
- <ClInclude Include="HexMergeDoc.h" />
- <ClInclude Include="HexMergeFrm.h" />
- <ClInclude Include="IAbortable.h" />
- <ClInclude Include="IListCtrlImpl.h" />
- <ClInclude Include="IntToIntMap.h" />
- <ClInclude Include="IOptionsPanel.h" />
- <ClInclude Include="Common\LanguageSelect.h" />
- <ClInclude Include="JumpList.h" />
- <ClInclude Include="LineFiltersDlg.h" />
- <ClInclude Include="LineFiltersList.h" />
- <ClInclude Include="LoadSaveCodepageDlg.h" />
- <ClInclude Include="locality.h" />
- <ClInclude Include="LocationBar.h" />
- <ClInclude Include="LocationView.h" />
- <ClInclude Include="Common\lwdisp.h" />
- <ClInclude Include="MainFrm.h" />
- <ClInclude Include="markdown.h" />
- <ClInclude Include="Common\MDITabBar.h" />
- <ClInclude Include="Common\memdc.h" />
- <ClInclude Include="Merge.h" />
- <ClInclude Include="MergeApp.h" />
- <ClInclude Include="MergeCmdLineInfo.h" />
- <ClInclude Include="MergeDoc.h" />
- <ClInclude Include="MergeEditStatus.h" />
- <ClInclude Include="MergeEditView.h" />
- <ClInclude Include="MergeLineFlags.h" />
- <ClInclude Include="Common\MessageBoxDialog.h" />
- <ClInclude Include="MovedLines.h" />
- <ClInclude Include="Common\multiformatText.h" />
- <ClInclude Include="OpenDoc.h" />
- <ClInclude Include="OpenFrm.h" />
- <ClInclude Include="OpenView.h" />
- <ClInclude Include="OptionsDef.h" />
- <ClInclude Include="common\OptionsMgr.h" />
- <ClInclude Include="OptionsDiffColors.h" />
- <ClInclude Include="OptionsDiffOptions.h" />
- <ClInclude Include="OptionsFont.h" />
- <ClInclude Include="OptionsInit.h" />
- <ClInclude Include="OptionsPanel.h" />
- <ClInclude Include="OptionsSyntaxColors.h" />
- <ClInclude Include="PatchDlg.h" />
- <ClInclude Include="PatchHTML.h" />
- <ClInclude Include="PatchTool.h" />
- <ClInclude Include="PathContext.h" />
- <ClInclude Include="paths.h" />
- <ClInclude Include="Common\Picture.h" />
- <ClInclude Include="Common\PidlContainer.h" />
- <ClInclude Include="PluginManager.h" />
- <ClInclude Include="Plugins.h" />
- <ClInclude Include="PluginsListDlg.h" />
- <ClInclude Include="Common\PreferencesDlg.h" />
- <ClInclude Include="ProjectFile.h" />
- <ClInclude Include="ProjectFilePathsDlg.h" />
- <ClInclude Include="PropArchive.h" />
- <ClInclude Include="PropBackups.h" />
- <ClInclude Include="PropCodepage.h" />
- <ClInclude Include="PropColors.h" />
- <ClInclude Include="PropCompare.h" />
- <ClInclude Include="PropCompareBinary.h" />
- <ClInclude Include="PropCompareFolder.h" />
- <ClInclude Include="PropCompareImage.h" />
- <ClInclude Include="PropEditor.h" />
- <ClInclude Include="Common\PropertyPageHost.h" />
- <ClInclude Include="PropGeneral.h" />
- <ClInclude Include="PropRegistry.h" />
- <ClInclude Include="PropShell.h" />
- <ClInclude Include="PropSyntaxColors.h" />
- <ClInclude Include="PropTextColors.h" />
- <ClInclude Include="PropVss.h" />
- <ClInclude Include="Common\RegKey.h" />
- <ClInclude Include="Common\RegOptionsMgr.h" />
- <ClInclude Include="Resource.h" />
- <ClInclude Include="SaveClosingDlg.h" />
- <ClInclude Include="Common\scbarcf.h" />
- <ClInclude Include="Common\scbarg.h" />
- <ClInclude Include="SelectUnpackerDlg.h" />
- <ClInclude Include="SharedFilterDlg.h" />
- <ClInclude Include="Common\ShellContextMenu.h" />
- <ClInclude Include="Common\ShellFileOperations.h" />
- <ClInclude Include="Common\sizecbar.h" />
- <ClInclude Include="Common\SortHeaderCtrl.h" />
- <ClInclude Include="Common\SplitterWndEx.h" />
- <ClInclude Include="SourceControl.h" />
- <ClInclude Include="ssapi.h" />
- <ClInclude Include="StdAfx.h" />
- <ClInclude Include="stringdiffs.h" />
- <ClInclude Include="stringdiffsi.h" />
- <ClInclude Include="Common\SuperComboBox.h" />
- <ClInclude Include="TempFile.h" />
- <ClInclude Include="TestMain.h" />
- <ClInclude Include="TestFilterDlg.h" />
- <ClInclude Include="Common\unicoder.h" />
- <ClInclude Include="Common\UnicodeString.h" />
- <ClInclude Include="Common\UniFile.h" />
- <ClInclude Include="TrDialogs.h" />
- <ClInclude Include="UniMarkdownFile.h" />
- <ClInclude Include="Common\varprop.h" />
- <ClInclude Include="Common\version.h" />
- <ClInclude Include="VSSHelper.h" />
- <ClInclude Include="VssPromptDlg.h" />
- <ClInclude Include="WMGotoDlg.h" />
- <ClInclude Include="diffutils\lib\cmpbuf.h" />
- <ClInclude Include="diffutils\config.h" />
- <ClInclude Include="diffutils\src\diff.h" />
- <ClInclude Include="diffutils\src\system.h" />
- <ClInclude Include="CompareEngines\ByteComparator.h" />
- <ClInclude Include="CompareEngines\ByteCompare.h" />
- <ClInclude Include="CompareEngines\DiffUtils.h" />
- <ClInclude Include="CompareEngines\TimeSizeCompare.h" />
- </ItemGroup>
- <ItemGroup>
- <None Include="..\Externals\crystaledit\editlib\ccrystaleditview.inl" />
- <None Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.inl" />
- <None Include="..\Externals\crystaledit\editlib\ccrystaltextview.inl" />
- <None Include="..\Externals\crystaledit\editlib\filesup.inl" />
- <None Include="..\Externals\crystaledit\editlib\memcombo.inl" />
- <None Include="res\binarydiff.ico" />
- <None Include="res\both.bmp" />
- <None Include="res\equalbinary.ico" />
- <None Include="res\equalfile.ico" />
- <None Include="res\error.ico" />
- <None Include="res\fileskip.ico" />
- <None Include="res\folder.ico" />
- <None Include="res\folderskip.ico" />
- <None Include="res\folderup.ico" />
- <None Include="res\folderup_disable.ico" />
- <None Include="res\hand.cur" />
- <None Include="res\left.bmp" />
- <None Include="res\left_to_browse.bmp" />
- <None Include="res\left_to_right.bmp" />
- <None Include="res\lfile.ico" />
- <None Include="res\lfolder.ico" />
- <None Include="res\Merge.ico" />
- <None Include="res\Merge.rc2" />
- <None Include="res\MergeDir.ico" />
- <None Include="res\MergeDoc.ico" />
- <None Include="res\MergeProject.ico" />
- <None Include="res\mg_cur.cur" />
- <None Include="res\move_left_to_browse.bmp" />
- <None Include="res\move_right_to_browse.bmp" />
- <None Include="res\notequalfile.ico" />
- <None Include="res\rfile.ico" />
- <None Include="res\rfolder.ico" />
- <None Include="res\right.bmp" />
- <None Include="res\right_to_browse.bmp" />
- <None Include="res\right_to_left.bmp" />
- <None Include="res\sigma.ico" />
- <None Include="CHANGELO" />
- <None Include="..\Docs\Users\ChangeLog.txt" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="Merge.rc" />
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
- <ProjectExtensions>
- <VisualStudio>
- <UserProperties RESOURCE_FILE="Merge.rc" />
- </VisualStudio>
- </ProjectExtensions>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+ <ItemGroup Label="ProjectConfigurations">\r
+ <ProjectConfiguration Include="UnicodeDebug|Win32">\r
+ <Configuration>UnicodeDebug</Configuration>\r
+ <Platform>Win32</Platform>\r
+ </ProjectConfiguration>\r
+ <ProjectConfiguration Include="UnicodeDebug|x64">\r
+ <Configuration>UnicodeDebug</Configuration>\r
+ <Platform>x64</Platform>\r
+ </ProjectConfiguration>\r
+ <ProjectConfiguration Include="UnicodeRelease|Win32">\r
+ <Configuration>UnicodeRelease</Configuration>\r
+ <Platform>Win32</Platform>\r
+ </ProjectConfiguration>\r
+ <ProjectConfiguration Include="UnicodeRelease|x64">\r
+ <Configuration>UnicodeRelease</Configuration>\r
+ <Platform>x64</Platform>\r
+ </ProjectConfiguration>\r
+ </ItemGroup>\r
+ <PropertyGroup Label="Globals">\r
+ <ProjectName>Merge</ProjectName>\r
+ <ProjectGuid>{9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}</ProjectGuid>\r
+ <RootNamespace>Merge</RootNamespace>\r
+ <Keyword>MFCProj</Keyword>\r
+ </PropertyGroup>\r
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'" Label="Configuration">\r
+ <ConfigurationType>Application</ConfigurationType>\r
+ <UseOfMfc>Static</UseOfMfc>\r
+ <CharacterSet>Unicode</CharacterSet>\r
+ <PlatformToolset>v140_xp</PlatformToolset>\r
+ </PropertyGroup>\r
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'" Label="Configuration">\r
+ <ConfigurationType>Application</ConfigurationType>\r
+ <UseOfMfc>Static</UseOfMfc>\r
+ <CharacterSet>Unicode</CharacterSet>\r
+ <PlatformToolset>v140_xp</PlatformToolset>\r
+ </PropertyGroup>\r
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'" Label="Configuration">\r
+ <ConfigurationType>Application</ConfigurationType>\r
+ <UseOfMfc>Static</UseOfMfc>\r
+ <CharacterSet>Unicode</CharacterSet>\r
+ <PlatformToolset>v140_xp</PlatformToolset>\r
+ </PropertyGroup>\r
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'" Label="Configuration">\r
+ <ConfigurationType>Application</ConfigurationType>\r
+ <UseOfMfc>Static</UseOfMfc>\r
+ <CharacterSet>Unicode</CharacterSet>\r
+ <PlatformToolset>v140_xp</PlatformToolset>\r
+ </PropertyGroup>\r
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+ <ImportGroup Label="ExtensionSettings">\r
+ </ImportGroup>\r
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'" Label="PropertySheets">\r
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+ </ImportGroup>\r
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'" Label="PropertySheets">\r
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+ </ImportGroup>\r
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'" Label="PropertySheets">\r
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+ </ImportGroup>\r
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'" Label="PropertySheets">\r
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+ </ImportGroup>\r
+ <PropertyGroup Label="UserMacros" />\r
+ <PropertyGroup>\r
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">.\..\Build\Merge$(Configuration)\</OutDir>\r
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">.\..\BuildTmp\Merge$(Configuration)\</IntDir>\r
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">false</LinkIncremental>\r
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">.\..\Build\$(Platform)\Merge$(Configuration)\</OutDir>\r
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">.\..\BuildTmp\$(Platform)\Merge$(Configuration)\</IntDir>\r
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">false</LinkIncremental>\r
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">true</EmbedManifest>\r
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">.\..\Build\Merge$(Configuration)\</OutDir>\r
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">.\..\BuildTmp\Merge$(Configuration)\</IntDir>\r
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</LinkIncremental>\r
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">.\..\Build\$(Platform)\Merge$(Configuration)\</OutDir>\r
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">.\..\BuildTmp\$(Platform)\Merge$(Configuration)\</IntDir>\r
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">true</LinkIncremental>\r
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">true</EmbedManifest>\r
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">Win$(ProjectName)U</TargetName>\r
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">Win$(ProjectName)U</TargetName>\r
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Win$(ProjectName)U</TargetName>\r
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">Win$(ProjectName)U</TargetName>\r
+ </PropertyGroup>\r
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">\r
+ <Midl>\r
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+ <MkTypLibCompatible>true</MkTypLibCompatible>\r
+ <SuppressStartupBanner>true</SuppressStartupBanner>\r
+ <TargetEnvironment>Win32</TargetEnvironment>\r
+ <HeaderFileName>\r
+ </HeaderFileName>\r
+ </Midl>\r
+ <ClCompile>\r
+ <AdditionalOptions>/EHa %(AdditionalOptions)</AdditionalOptions>\r
+ <Optimization>MinSpace</Optimization>\r
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+ <AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+ <PreprocessorDefinitions>WIN32;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+ <StringPooling>true</StringPooling>\r
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
+ <FunctionLevelLinking>true</FunctionLevelLinking>\r
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
+ <PrecompiledHeader>Use</PrecompiledHeader>\r
+ <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
+ <WarningLevel>Level3</WarningLevel>\r
+ <SuppressStartupBanner>true</SuppressStartupBanner>\r
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+ <CompileAs>Default</CompileAs>\r
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>\r
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+ <ExceptionHandling>Async</ExceptionHandling>\r
+ </ClCompile>\r
+ <ResourceCompile>\r
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+ <Culture>0x0409</Culture>\r
+ </ResourceCompile>\r
+ <Link>\r
+ <AdditionalOptions>/verbose:lib %(AdditionalOptions)</AdditionalOptions>\r
+ <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+ <OutputFile>$(OutDir)/WinMergeU.exe</OutputFile>\r
+ <SuppressStartupBanner>true</SuppressStartupBanner>\r
+ <AdditionalLibraryDirectories>..\Externals\poco\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <IgnoreSpecificDefaultLibraries>msvcrtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>\r
+ <GenerateDebugInformation>true</GenerateDebugInformation>\r
+ <SubSystem>Windows</SubSystem>\r
+ <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>\r
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
+ <DataExecutionPrevention>\r
+ </DataExecutionPrevention>\r
+ <TargetMachine>MachineX86</TargetMachine>\r
+ <GenerateMapFile>true</GenerateMapFile>\r
+ </Link>\r
+ <PostBuildEvent>\r
+ <Command>\r
+ </Command>\r
+ </PostBuildEvent>\r
+ </ItemDefinitionGroup>\r
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">\r
+ <CustomBuildStep>\r
+ <Command>\r
+ </Command>\r
+ <Outputs>$(TargetDir)WinMergeU.map;%(Outputs)</Outputs>\r
+ </CustomBuildStep>\r
+ <Midl>\r
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+ <MkTypLibCompatible>true</MkTypLibCompatible>\r
+ <SuppressStartupBanner>true</SuppressStartupBanner>\r
+ <TargetEnvironment>X64</TargetEnvironment>\r
+ <HeaderFileName>\r
+ </HeaderFileName>\r
+ </Midl>\r
+ <ClCompile>\r
+ <AdditionalOptions>/EHa %(AdditionalOptions)</AdditionalOptions>\r
+ <Optimization>MinSpace</Optimization>\r
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+ <AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+ <PreprocessorDefinitions>WIN64;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+ <StringPooling>true</StringPooling>\r
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
+ <FunctionLevelLinking>true</FunctionLevelLinking>\r
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
+ <PrecompiledHeader>Use</PrecompiledHeader>\r
+ <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
+ <WarningLevel>Level3</WarningLevel>\r
+ <SuppressStartupBanner>true</SuppressStartupBanner>\r
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+ <CompileAs>Default</CompileAs>\r
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+ <ExceptionHandling>Async</ExceptionHandling>\r
+ </ClCompile>\r
+ <ResourceCompile>\r
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+ <Culture>0x0409</Culture>\r
+ </ResourceCompile>\r
+ <Link>\r
+ <AdditionalOptions>/verbose:lib %(AdditionalOptions)</AdditionalOptions>\r
+ <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+ <OutputFile>$(OutDir)/WinMergeU.exe</OutputFile>\r
+ <SuppressStartupBanner>true</SuppressStartupBanner>\r
+ <AdditionalLibraryDirectories>..\Externals\poco\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <IgnoreSpecificDefaultLibraries>msvcrtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>\r
+ <GenerateDebugInformation>true</GenerateDebugInformation>\r
+ <SubSystem>Windows</SubSystem>\r
+ <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>\r
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
+ <DataExecutionPrevention>\r
+ </DataExecutionPrevention>\r
+ <TargetMachine>MachineX64</TargetMachine>\r
+ <GenerateMapFile>true</GenerateMapFile>\r
+ <OptimizeReferences>\r
+ </OptimizeReferences>\r
+ </Link>\r
+ <PostBuildEvent>\r
+ <Command>\r
+ </Command>\r
+ </PostBuildEvent>\r
+ </ItemDefinitionGroup>\r
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">\r
+ <Midl>\r
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+ <MkTypLibCompatible>true</MkTypLibCompatible>\r
+ <SuppressStartupBanner>true</SuppressStartupBanner>\r
+ <TargetEnvironment>Win32</TargetEnvironment>\r
+ <HeaderFileName>\r
+ </HeaderFileName>\r
+ </Midl>\r
+ <ClCompile>\r
+ <AdditionalOptions>/EHa %(AdditionalOptions)</AdditionalOptions>\r
+ <Optimization>Disabled</Optimization>\r
+ <AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+ <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\r
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
+ <PrecompiledHeader>Use</PrecompiledHeader>\r
+ <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
+ <BrowseInformation>true</BrowseInformation>\r
+ <WarningLevel>Level3</WarningLevel>\r
+ <SuppressStartupBanner>true</SuppressStartupBanner>\r
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
+ <CompileAs>Default</CompileAs>\r
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>\r
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+ <ExceptionHandling>Async</ExceptionHandling>\r
+ </ClCompile>\r
+ <ResourceCompile>\r
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+ <Culture>0x0409</Culture>\r
+ </ResourceCompile>\r
+ <Link>\r
+ <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+ <OutputFile>$(OutDir)/WinMergeU.exe</OutputFile>\r
+ <SuppressStartupBanner>true</SuppressStartupBanner>\r
+ <AdditionalLibraryDirectories>..\Externals\poco\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <GenerateDebugInformation>true</GenerateDebugInformation>\r
+ <SubSystem>Windows</SubSystem>\r
+ <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>\r
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
+ <DataExecutionPrevention>\r
+ </DataExecutionPrevention>\r
+ <TargetMachine>MachineX86</TargetMachine>\r
+ <GenerateMapFile>true</GenerateMapFile>\r
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>\r
+ </Link>\r
+ <PostBuildEvent>\r
+ <Command>\r
+ </Command>\r
+ </PostBuildEvent>\r
+ </ItemDefinitionGroup>\r
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">\r
+ <CustomBuildStep>\r
+ <Command>\r
+ </Command>\r
+ <Outputs>$(TargetDir)WinMergeU.map;%(Outputs)</Outputs>\r
+ </CustomBuildStep>\r
+ <Midl>\r
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+ <MkTypLibCompatible>true</MkTypLibCompatible>\r
+ <SuppressStartupBanner>true</SuppressStartupBanner>\r
+ <TargetEnvironment>X64</TargetEnvironment>\r
+ <HeaderFileName>\r
+ </HeaderFileName>\r
+ </Midl>\r
+ <ClCompile>\r
+ <AdditionalOptions>/EHa %(AdditionalOptions)</AdditionalOptions>\r
+ <Optimization>Disabled</Optimization>\r
+ <AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+ <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\r
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
+ <PrecompiledHeader>Use</PrecompiledHeader>\r
+ <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
+ <BrowseInformation>true</BrowseInformation>\r
+ <WarningLevel>Level3</WarningLevel>\r
+ <SuppressStartupBanner>true</SuppressStartupBanner>\r
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
+ <CompileAs>Default</CompileAs>\r
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+ <ExceptionHandling>Async</ExceptionHandling>\r
+ </ClCompile>\r
+ <ResourceCompile>\r
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+ <Culture>0x0409</Culture>\r
+ </ResourceCompile>\r
+ <Link>\r
+ <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+ <OutputFile>$(OutDir)/WinMergeU.exe</OutputFile>\r
+ <SuppressStartupBanner>true</SuppressStartupBanner>\r
+ <AdditionalLibraryDirectories>..\Externals\poco\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <GenerateDebugInformation>true</GenerateDebugInformation>\r
+ <SubSystem>Windows</SubSystem>\r
+ <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>\r
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
+ <DataExecutionPrevention>\r
+ </DataExecutionPrevention>\r
+ <TargetMachine>MachineX64</TargetMachine>\r
+ <GenerateMapFile>true</GenerateMapFile>\r
+ <Profile>false</Profile>\r
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>\r
+ </Link>\r
+ <PostBuildEvent>\r
+ <Command>\r
+ </Command>\r
+ </PostBuildEvent>\r
+ </ItemDefinitionGroup>\r
+ <ItemGroup>\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\asp.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\basic.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\batch.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaleditview.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview2.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\ceditreplacedlg.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\cfindtextdlg.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\chcondlg.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\cplusplus.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\cregexp_poco.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\crystaleditviewex.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\crystalparser.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\crystaltextblock.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\cs2cs.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\csharp.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\css.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\dcl.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\filesup.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\fortran.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\fpattern.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\go.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\gotodlg.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\html.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\ini.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\innosetup.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\is.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\java.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\LineInfo.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\lisp.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\memcombo.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\nsis.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\pascal.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\perl.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\php.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\po.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\powershell.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\python.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\registry.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\rexx.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\rsrc.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\ruby.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\rust.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\sgml.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\sh.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\siod.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\sql.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\statbar.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\string_util.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\SyntaxColors.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\tcl.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\tex.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\UndoRecord.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\verilog.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\ViewableWhitespace.cpp" />\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\xml.cpp" />\r
+ <ClCompile Include="7zCommon.cpp">\r
+ </ClCompile>\r
+ <ClCompile Include="AboutDlg.cpp">\r
+ </ClCompile>\r
+ <ClCompile Include="Common\BCMenu.cpp" />\r
+ <ClCompile Include="Common\Bitmap.cpp" />\r
+ <ClCompile Include="CCPromptDlg.cpp">\r
+ </ClCompile>\r
+ <ClCompile Include="charsets.c">\r
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</BrowseInformation>\r
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">true</BrowseInformation>\r
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Disabled</Optimization>\r
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">Disabled</Optimization>\r
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">MinSpace</Optimization>\r
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">MinSpace</Optimization>\r
+ </ClCompile>\r
+ <ClCompile Include="ChildFrm.cpp" />\r
+ <ClCompile Include="Common\ClipBoard.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="Common\CMoveConstraint.cpp" />\r
+ <ClCompile Include="codepage_detect.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="Common\ColorButton.cpp" />\r
+ <ClCompile Include="Common\ExConverter.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="CompareEngines\BinaryCompare.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="CompareOptions.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="CompareStatisticsDlg.cpp" />\r
+ <ClCompile Include="CompareStats.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="ConfigLog.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="ConfirmFolderCopyDlg.cpp" />\r
+ <ClCompile Include="ConflictFileParser.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="Common\coretools.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="DropHandler.cpp" />\r
+ <ClCompile Include="ImgMergeFrm.cpp" />\r
+ <ClCompile Include="Merge7zFormatMergePluginImpl.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="Merge7zFormatShellImpl.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="MergeStatusBar.cpp" />\r
+ <ClCompile Include="OptionsDef.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="OptionsCustomColors.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="DiffContext.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="DiffFileData.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="DiffFileInfo.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="DiffItem.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="DiffItemList.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="DiffList.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="DiffTextBuffer.cpp" />\r
+ <ClCompile Include="DiffThread.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="DiffViewBar.cpp" />\r
+ <ClCompile Include="DiffWrapper.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="DirActions.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="DirCmpReport.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="DirCmpReportDlg.cpp" />\r
+ <ClCompile Include="DirColsDlg.cpp" />\r
+ <ClCompile Include="DirCompProgressBar.cpp" />\r
+ <ClCompile Include="DirDoc.cpp" />\r
+ <ClCompile Include="DirFrame.cpp" />\r
+ <ClCompile Include="DirItem.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="DirScan.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="DirTravel.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="DirView.cpp" />\r
+ <ClCompile Include="DirViewColItems.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="dllpstub.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="EditorFilepathBar.cpp" />\r
+ <ClCompile Include="EncodingErrorBar.cpp" />\r
+ <ClCompile Include="Environment.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="FileActionScript.cpp" />\r
+ <ClCompile Include="FileFilter.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="FileFilterHelper.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="FileFilterMgr.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="FileFiltersDlg.cpp" />\r
+ <ClCompile Include="FileOrFolderSelect.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="FilepathEdit.cpp" />\r
+ <ClCompile Include="FileTextEncoding.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="FileTransform.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="FileVersion.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="FilterCommentsManager.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="FilterList.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="FolderCmp.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="GhostTextBuffer.cpp" />\r
+ <ClCompile Include="GhostTextView.cpp" />\r
+ <ClCompile Include="HexMergeDoc.cpp" />\r
+ <ClCompile Include="HexMergeFrm.cpp" />\r
+ <ClCompile Include="HexMergeView.cpp" />\r
+ <ClCompile Include="Common\LanguageSelect.cpp" />\r
+ <ClCompile Include="JumpList.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="LineFiltersDlg.cpp" />\r
+ <ClCompile Include="LineFiltersList.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="LoadSaveCodepageDlg.cpp" />\r
+ <ClCompile Include="locality.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="LocationBar.cpp" />\r
+ <ClCompile Include="LocationView.cpp" />\r
+ <ClCompile Include="Common\lwdisp.c">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="MainFrm.cpp" />\r
+ <ClCompile Include="markdown.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="Common\MDITabBar.cpp" />\r
+ <ClCompile Include="Merge.cpp" />\r
+ <ClCompile Include="MergeApp.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="MergeCmdLineInfo.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="MergeDoc.cpp" />\r
+ <ClCompile Include="MergeDocDiffSync.cpp" />\r
+ <ClCompile Include="MergeDocEncoding.cpp" />\r
+ <ClCompile Include="MergeDocLineDiffs.cpp" />\r
+ <ClCompile Include="MergeEditView.cpp" />\r
+ <ClCompile Include="Common\MessageBoxDialog.cpp" />\r
+ <ClCompile Include="MovedBlocks.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="MovedLines.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="Common\multiformatText.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="OpenDoc.cpp" />\r
+ <ClCompile Include="OpenFrm.cpp" />\r
+ <ClCompile Include="OpenView.cpp" />\r
+ <ClCompile Include="OptionsDiffColors.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="OptionsDiffOptions.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="OptionsFont.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="OptionsInit.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="common\OptionsMgr.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="OptionsPanel.cpp" />\r
+ <ClCompile Include="OptionsSyntaxColors.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="PatchDlg.cpp" />\r
+ <ClCompile Include="PatchHTML.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="PatchTool.cpp" />\r
+ <ClCompile Include="PathContext.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="paths.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="Common\Picture.cpp" />\r
+ <ClCompile Include="Common\PidlContainer.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="PluginManager.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="Plugins.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="PluginsListDlg.cpp" />\r
+ <ClCompile Include="Common\PreferencesDlg.cpp" />\r
+ <ClCompile Include="ProjectFile.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="ProjectFilePathsDlg.cpp" />\r
+ <ClCompile Include="PropArchive.cpp" />\r
+ <ClCompile Include="PropBackups.cpp" />\r
+ <ClCompile Include="PropCodepage.cpp" />\r
+ <ClCompile Include="PropColors.cpp" />\r
+ <ClCompile Include="PropCompare.cpp" />\r
+ <ClCompile Include="PropCompareBinary.cpp" />\r
+ <ClCompile Include="PropCompareFolder.cpp" />\r
+ <ClCompile Include="PropCompareImage.cpp" />\r
+ <ClCompile Include="PropEditor.cpp" />\r
+ <ClCompile Include="Common\PropertyPageHost.cpp" />\r
+ <ClCompile Include="PropGeneral.cpp" />\r
+ <ClCompile Include="PropMarkerColors.cpp" />\r
+ <ClCompile Include="PropRegistry.cpp" />\r
+ <ClCompile Include="PropShell.cpp" />\r
+ <ClCompile Include="PropSyntaxColors.cpp" />\r
+ <ClCompile Include="PropTextColors.cpp" />\r
+ <ClCompile Include="PropVss.cpp" />\r
+ <ClCompile Include="Common\RegKey.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="Common\RegOptionsMgr.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="SaveClosingDlg.cpp" />\r
+ <ClCompile Include="Common\scbarcf.cpp" />\r
+ <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\ShellFileOperations.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="Common\sizecbar.cpp" />\r
+ <ClCompile Include="Common\SortHeaderCtrl.cpp" />\r
+ <ClCompile Include="SourceControl.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="Common\SplitterWndEx.cpp" />\r
+ <ClCompile Include="StdAfx.cpp">\r
+ <PrecompiledHeader>Create</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="stringdiffs.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="Common\SuperComboBox.cpp" />\r
+ <ClCompile Include="TempFile.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="Test.cpp" />\r
+ <ClCompile Include="TestFilterDlg.cpp" />\r
+ <ClCompile Include="Common\unicoder.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="Common\UnicodeString.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="Common\UniFile.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="TestMain.cpp" />\r
+ <ClCompile Include="TrDialogs.cpp" />\r
+ <ClCompile Include="UniMarkdownFile.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="Common\varprop.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="Common\version.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="VSSHelper.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="VssPromptDlg.cpp" />\r
+ <ClCompile Include="WMGotoDlg.cpp" />\r
+ <ClCompile Include="diffutils\src\analyze.c">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="diffutils\lib\cmpbuf.c">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="diffutils\src\context.c">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="diffutils\src\Diff.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="diffutils\src\ed.c">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="diffutils\GnuVersion.c">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="diffutils\src\ifdef.c">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="diffutils\src\io.c">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="diffutils\src\normal.c">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="diffutils\src\side.c">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="diffutils\src\util.c">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="diffutils\src\mystat.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="CompareEngines\ByteComparator.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="CompareEngines\ByteCompare.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="CompareEngines\DiffUtils.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ <ClCompile Include="CompareEngines\TimeSizeCompare.cpp">\r
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+ </ClCompile>\r
+ </ItemGroup>\r
+ <ItemGroup>\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaleditview.h" />\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.h" />\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.h" />\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextview.h" />\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\ceditreplacedlg.h" />\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\cfindtextdlg.h" />\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\chcondlg.h" />\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\cregexp.h" />\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\crystaleditviewex.h" />\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\crystalparser.h" />\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\crystaltextblock.h" />\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\cs2cs.h" />\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\editcmd.h" />\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\editreg.h" />\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\edtlib.h" />\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\filesup.h" />\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\fpattern.h" />\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\gotodlg.h" />\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\LineInfo.h" />\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\memcombo.h" />\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\registry.h" />\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\statbar.h" />\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\string_util.h" />\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\SyntaxColors.h" />\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\UndoRecord.h" />\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\ViewableWhitespace.h" />\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\wispelld.h" />\r
+ <ClInclude Include="7zCommon.h" />\r
+ <ClInclude Include="AboutDlg.h" />\r
+ <ClInclude Include="Common\BCMenu.h" />\r
+ <ClInclude Include="Common\Bitmap.h" />\r
+ <ClInclude Include="CCPromptDlg.h" />\r
+ <ClInclude Include="charsets.h" />\r
+ <ClInclude Include="ChildFrm.h" />\r
+ <ClInclude Include="Common\ClipBoard.h" />\r
+ <ClInclude Include="Common\CMoveConstraint.h" />\r
+ <ClInclude Include="codepage_detect.h" />\r
+ <ClInclude Include="Common\ColorButton.h" />\r
+ <ClInclude Include="Common\ExConverter.h" />\r
+ <ClInclude Include="CompareEngines\BinaryCompare.h" />\r
+ <ClInclude Include="CompareOptions.h" />\r
+ <ClInclude Include="CompareStatisticsDlg.h" />\r
+ <ClInclude Include="CompareStats.h" />\r
+ <ClInclude Include="ConfigLog.h" />\r
+ <ClInclude Include="ConfirmFolderCopyDlg.h" />\r
+ <ClInclude Include="ConflictFileParser.h" />\r
+ <ClInclude Include="Common\coretools.h" />\r
+ <ClInclude Include="Common\coretypes.h" />\r
+ <ClInclude Include="Constants.h" />\r
+ <ClInclude Include="DirActions.h" />\r
+ <ClInclude Include="HexMergeView.h" />\r
+ <ClInclude Include="DropHandler.h" />\r
+ <ClInclude Include="IMergeDoc.h" />\r
+ <ClInclude Include="ImgMergeFrm.h" />\r
+ <ClInclude Include="Merge7zFormatMergePluginImpl.h" />\r
+ <ClInclude Include="Merge7zFormatRegister.h" />\r
+ <ClInclude Include="Merge7zFormatShellImpl.h" />\r
+ <ClInclude Include="MergeStatusBar.h" />\r
+ <ClInclude Include="OptionsCustomColors.h" />\r
+ <ClInclude Include="Diff3.h" />\r
+ <ClInclude Include="DiffContext.h" />\r
+ <ClInclude Include="DiffFileData.h" />\r
+ <ClInclude Include="DiffFileInfo.h" />\r
+ <ClInclude Include="DiffItem.h" />\r
+ <ClInclude Include="DiffItemList.h" />\r
+ <ClInclude Include="DiffList.h" />\r
+ <ClInclude Include="DiffTextBuffer.h" />\r
+ <ClInclude Include="DiffThread.h" />\r
+ <ClInclude Include="DiffViewBar.h" />\r
+ <ClInclude Include="DiffWrapper.h" />\r
+ <ClInclude Include="DirCmpReport.h" />\r
+ <ClInclude Include="DirCmpReportDlg.h" />\r
+ <ClInclude Include="DirColsDlg.h" />\r
+ <ClInclude Include="DirCompProgressBar.h" />\r
+ <ClInclude Include="DirDoc.h" />\r
+ <ClInclude Include="DirFrame.h" />\r
+ <ClInclude Include="DirItem.h" />\r
+ <ClInclude Include="DirReportTypes.h" />\r
+ <ClInclude Include="DirScan.h" />\r
+ <ClInclude Include="DirTravel.h" />\r
+ <ClInclude Include="DirView.h" />\r
+ <ClInclude Include="DirViewColItems.h" />\r
+ <ClInclude Include="dllpstub.h" />\r
+ <ClInclude Include="EditorFilepathBar.h" />\r
+ <ClInclude Include="EncodingErrorBar.h" />\r
+ <ClInclude Include="Environment.h" />\r
+ <ClInclude Include="Exceptions.h" />\r
+ <ClInclude Include="FileActionScript.h" />\r
+ <ClInclude Include="FileFilter.h" />\r
+ <ClInclude Include="FileFilterHelper.h" />\r
+ <ClInclude Include="FileFilterMgr.h" />\r
+ <ClInclude Include="FileFiltersDlg.h" />\r
+ <ClInclude Include="FileLocation.h" />\r
+ <ClInclude Include="FileOrFolderSelect.h" />\r
+ <ClInclude Include="FilepathEdit.h" />\r
+ <ClInclude Include="files.h" />\r
+ <ClInclude Include="FileTextEncoding.h" />\r
+ <ClInclude Include="FileTextStats.h" />\r
+ <ClInclude Include="FileTransform.h" />\r
+ <ClInclude Include="FileVersion.h" />\r
+ <ClInclude Include="FilterCommentsManager.h" />\r
+ <ClInclude Include="FilterList.h" />\r
+ <ClInclude Include="FolderCmp.h" />\r
+ <ClInclude Include="GhostTextBuffer.h" />\r
+ <ClInclude Include="GhostTextView.h" />\r
+ <ClInclude Include="HexMergeDoc.h" />\r
+ <ClInclude Include="HexMergeFrm.h" />\r
+ <ClInclude Include="IAbortable.h" />\r
+ <ClInclude Include="IListCtrlImpl.h" />\r
+ <ClInclude Include="IntToIntMap.h" />\r
+ <ClInclude Include="IOptionsPanel.h" />\r
+ <ClInclude Include="Common\LanguageSelect.h" />\r
+ <ClInclude Include="JumpList.h" />\r
+ <ClInclude Include="LineFiltersDlg.h" />\r
+ <ClInclude Include="LineFiltersList.h" />\r
+ <ClInclude Include="LoadSaveCodepageDlg.h" />\r
+ <ClInclude Include="locality.h" />\r
+ <ClInclude Include="LocationBar.h" />\r
+ <ClInclude Include="LocationView.h" />\r
+ <ClInclude Include="Common\lwdisp.h" />\r
+ <ClInclude Include="MainFrm.h" />\r
+ <ClInclude Include="markdown.h" />\r
+ <ClInclude Include="Common\MDITabBar.h" />\r
+ <ClInclude Include="Common\memdc.h" />\r
+ <ClInclude Include="Merge.h" />\r
+ <ClInclude Include="MergeApp.h" />\r
+ <ClInclude Include="MergeCmdLineInfo.h" />\r
+ <ClInclude Include="MergeDoc.h" />\r
+ <ClInclude Include="MergeEditStatus.h" />\r
+ <ClInclude Include="MergeEditView.h" />\r
+ <ClInclude Include="MergeLineFlags.h" />\r
+ <ClInclude Include="Common\MessageBoxDialog.h" />\r
+ <ClInclude Include="MovedLines.h" />\r
+ <ClInclude Include="Common\multiformatText.h" />\r
+ <ClInclude Include="OpenDoc.h" />\r
+ <ClInclude Include="OpenFrm.h" />\r
+ <ClInclude Include="OpenView.h" />\r
+ <ClInclude Include="OptionsDef.h" />\r
+ <ClInclude Include="common\OptionsMgr.h" />\r
+ <ClInclude Include="OptionsDiffColors.h" />\r
+ <ClInclude Include="OptionsDiffOptions.h" />\r
+ <ClInclude Include="OptionsFont.h" />\r
+ <ClInclude Include="OptionsInit.h" />\r
+ <ClInclude Include="OptionsPanel.h" />\r
+ <ClInclude Include="OptionsSyntaxColors.h" />\r
+ <ClInclude Include="PatchDlg.h" />\r
+ <ClInclude Include="PatchHTML.h" />\r
+ <ClInclude Include="PatchTool.h" />\r
+ <ClInclude Include="PathContext.h" />\r
+ <ClInclude Include="paths.h" />\r
+ <ClInclude Include="Common\Picture.h" />\r
+ <ClInclude Include="Common\PidlContainer.h" />\r
+ <ClInclude Include="PluginManager.h" />\r
+ <ClInclude Include="Plugins.h" />\r
+ <ClInclude Include="PluginsListDlg.h" />\r
+ <ClInclude Include="Common\PreferencesDlg.h" />\r
+ <ClInclude Include="ProjectFile.h" />\r
+ <ClInclude Include="ProjectFilePathsDlg.h" />\r
+ <ClInclude Include="PropArchive.h" />\r
+ <ClInclude Include="PropBackups.h" />\r
+ <ClInclude Include="PropCodepage.h" />\r
+ <ClInclude Include="PropColors.h" />\r
+ <ClInclude Include="PropCompare.h" />\r
+ <ClInclude Include="PropCompareBinary.h" />\r
+ <ClInclude Include="PropCompareFolder.h" />\r
+ <ClInclude Include="PropCompareImage.h" />\r
+ <ClInclude Include="PropEditor.h" />\r
+ <ClInclude Include="Common\PropertyPageHost.h" />\r
+ <ClInclude Include="PropGeneral.h" />\r
+ <ClInclude Include="PropMarkerColors.h" />\r
+ <ClInclude Include="PropRegistry.h" />\r
+ <ClInclude Include="PropShell.h" />\r
+ <ClInclude Include="PropSyntaxColors.h" />\r
+ <ClInclude Include="PropTextColors.h" />\r
+ <ClInclude Include="PropVss.h" />\r
+ <ClInclude Include="Common\RegKey.h" />\r
+ <ClInclude Include="Common\RegOptionsMgr.h" />\r
+ <ClInclude Include="Resource.h" />\r
+ <ClInclude Include="SaveClosingDlg.h" />\r
+ <ClInclude Include="Common\scbarcf.h" />\r
+ <ClInclude Include="Common\scbarg.h" />\r
+ <ClInclude Include="SelectUnpackerDlg.h" />\r
+ <ClInclude Include="SharedFilterDlg.h" />\r
+ <ClInclude Include="Common\ShellContextMenu.h" />\r
+ <ClInclude Include="Common\ShellFileOperations.h" />\r
+ <ClInclude Include="Common\sizecbar.h" />\r
+ <ClInclude Include="Common\SortHeaderCtrl.h" />\r
+ <ClInclude Include="Common\SplitterWndEx.h" />\r
+ <ClInclude Include="SourceControl.h" />\r
+ <ClInclude Include="ssapi.h" />\r
+ <ClInclude Include="StdAfx.h" />\r
+ <ClInclude Include="stringdiffs.h" />\r
+ <ClInclude Include="stringdiffsi.h" />\r
+ <ClInclude Include="Common\SuperComboBox.h" />\r
+ <ClInclude Include="TempFile.h" />\r
+ <ClInclude Include="TestMain.h" />\r
+ <ClInclude Include="TestFilterDlg.h" />\r
+ <ClInclude Include="Common\unicoder.h" />\r
+ <ClInclude Include="Common\UnicodeString.h" />\r
+ <ClInclude Include="Common\UniFile.h" />\r
+ <ClInclude Include="TrDialogs.h" />\r
+ <ClInclude Include="UniMarkdownFile.h" />\r
+ <ClInclude Include="Common\varprop.h" />\r
+ <ClInclude Include="Common\version.h" />\r
+ <ClInclude Include="VSSHelper.h" />\r
+ <ClInclude Include="VssPromptDlg.h" />\r
+ <ClInclude Include="WMGotoDlg.h" />\r
+ <ClInclude Include="diffutils\lib\cmpbuf.h" />\r
+ <ClInclude Include="diffutils\config.h" />\r
+ <ClInclude Include="diffutils\src\diff.h" />\r
+ <ClInclude Include="diffutils\src\system.h" />\r
+ <ClInclude Include="CompareEngines\ByteComparator.h" />\r
+ <ClInclude Include="CompareEngines\ByteCompare.h" />\r
+ <ClInclude Include="CompareEngines\DiffUtils.h" />\r
+ <ClInclude Include="CompareEngines\TimeSizeCompare.h" />\r
+ </ItemGroup>\r
+ <ItemGroup>\r
+ <None Include="..\Externals\crystaledit\editlib\ccrystaleditview.inl" />\r
+ <None Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.inl" />\r
+ <None Include="..\Externals\crystaledit\editlib\ccrystaltextview.inl" />\r
+ <None Include="..\Externals\crystaledit\editlib\filesup.inl" />\r
+ <None Include="..\Externals\crystaledit\editlib\memcombo.inl" />\r
+ <None Include="res\binarydiff.ico" />\r
+ <None Include="res\both.bmp" />\r
+ <None Include="res\equalbinary.ico" />\r
+ <None Include="res\equalfile.ico" />\r
+ <None Include="res\error.ico" />\r
+ <None Include="res\fileskip.ico" />\r
+ <None Include="res\folder.ico" />\r
+ <None Include="res\folderskip.ico" />\r
+ <None Include="res\folderup.ico" />\r
+ <None Include="res\folderup_disable.ico" />\r
+ <None Include="res\hand.cur" />\r
+ <None Include="res\left.bmp" />\r
+ <None Include="res\left_to_browse.bmp" />\r
+ <None Include="res\left_to_right.bmp" />\r
+ <None Include="res\lfile.ico" />\r
+ <None Include="res\lfolder.ico" />\r
+ <None Include="res\Merge.ico" />\r
+ <None Include="res\Merge.rc2" />\r
+ <None Include="res\MergeDir.ico" />\r
+ <None Include="res\MergeDoc.ico" />\r
+ <None Include="res\MergeProject.ico" />\r
+ <None Include="res\mg_cur.cur" />\r
+ <None Include="res\move_left_to_browse.bmp" />\r
+ <None Include="res\move_right_to_browse.bmp" />\r
+ <None Include="res\notequalfile.ico" />\r
+ <None Include="res\rfile.ico" />\r
+ <None Include="res\rfolder.ico" />\r
+ <None Include="res\right.bmp" />\r
+ <None Include="res\right_to_browse.bmp" />\r
+ <None Include="res\right_to_left.bmp" />\r
+ <None Include="res\sigma.ico" />\r
+ <None Include="CHANGELO" />\r
+ <None Include="..\Docs\Users\ChangeLog.txt" />\r
+ </ItemGroup>\r
+ <ItemGroup>\r
+ <ResourceCompile Include="Merge.rc" />\r
+ </ItemGroup>\r
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+ <ImportGroup Label="ExtensionTargets">\r
+ </ImportGroup>\r
+ <ProjectExtensions>\r
+ <VisualStudio>\r
+ <UserProperties RESOURCE_FILE="Merge.rc" />\r
+ </VisualStudio>\r
+ </ProjectExtensions>\r
</Project>
\ No newline at end of file
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- <UniqueIdentifier>{e8f63c02-8bf9-425d-88d0-831ca188bbdf}</UniqueIdentifier>
- <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
- </Filter>
- <Filter Include="Header Files">
- <UniqueIdentifier>{ff78af1d-3eee-4c01-8be1-27cf73dfe922}</UniqueIdentifier>
- <Extensions>h;hpp;hxx;hm;inl</Extensions>
- </Filter>
- <Filter Include="Resource Files">
- <UniqueIdentifier>{4e04f59d-bb70-4e67-a8d7-2b01fb6d0cd8}</UniqueIdentifier>
- <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>
- </Filter>
- <Filter Include="EditLib">
- <UniqueIdentifier>{84d4664c-e7ea-4d24-8d55-b1303c40b7f4}</UniqueIdentifier>
- </Filter>
- <Filter Include="DiffEngine">
- <UniqueIdentifier>{16e1af2b-75c9-4deb-b49f-819018df0478}</UniqueIdentifier>
- </Filter>
- <Filter Include="ChangeLogs">
- <UniqueIdentifier>{aefb7247-d6e5-411d-9cc5-4a12f5efda4a}</UniqueIdentifier>
- </Filter>
- <Filter Include="Compare Engines">
- <UniqueIdentifier>{b889169f-de55-4db7-ad06-423f6438fa90}</UniqueIdentifier>
- <Extensions>cpp;c;h</Extensions>
- </Filter>
- <Filter Include="EditLib\parsers">
- <UniqueIdentifier>{740d4dd9-ab31-47b8-9cbb-8e6a7b5db4fe}</UniqueIdentifier>
- </Filter>
- <Filter Include="MFCGui">
- <UniqueIdentifier>{caf52667-921a-47aa-84a3-f277aac15107}</UniqueIdentifier>
- </Filter>
- <Filter Include="MFCGui\Source Files">
- <UniqueIdentifier>{5dc3ba0d-6755-48f8-ad11-df56b167b514}</UniqueIdentifier>
- </Filter>
- <Filter Include="MFCGui\Header Files">
- <UniqueIdentifier>{10ce7aff-bcfd-4ed0-98c3-766226c4c89e}</UniqueIdentifier>
- </Filter>
- <Filter Include="MFCGui\Dialogs">
- <UniqueIdentifier>{d520b3a7-c530-4053-8766-07c26ed85f85}</UniqueIdentifier>
- </Filter>
- <Filter Include="MFCGui\Dialogs\PropertyPages">
- <UniqueIdentifier>{c6b39fdf-7c68-42c3-895b-da25bb6e51b4}</UniqueIdentifier>
- </Filter>
- <Filter Include="MFCGui\Common">
- <UniqueIdentifier>{297182f0-e39d-4ac4-9df3-315882ce9e07}</UniqueIdentifier>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="charsets.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="codepage_detect.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="CompareOptions.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="CompareStats.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="ConfigLog.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="ConflictFileParser.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="Common\coretools.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="DiffContext.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="DiffFileData.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="DiffFileInfo.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="DiffItem.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="DiffItemList.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="DiffList.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="DiffThread.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="DiffWrapper.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="DirCmpReport.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="DirItem.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="DirScan.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="DirTravel.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="dllpstub.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="Environment.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="FileFilter.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="FileFilterHelper.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="FileFilterMgr.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="FileTextEncoding.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="FileTransform.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="FileVersion.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="FilterCommentsManager.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="FilterList.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="FolderCmp.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="locality.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="Common\lwdisp.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="markdown.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="MergeCmdLineInfo.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="MovedBlocks.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="MovedLines.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="Common\multiformatText.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="OptionsInit.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="common\OptionsMgr.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="PatchHTML.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="PathContext.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="paths.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="Common\PidlContainer.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="PluginManager.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="Plugins.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="ProjectFile.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="Common\RegKey.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="Common\RegOptionsMgr.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="Common\ShellFileOperations.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="stringdiffs.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="TempFile.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="Common\unicoder.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="Common\UnicodeString.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="Common\UniFile.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="UniMarkdownFile.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="Common\varprop.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="Common\version.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="VSSHelper.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="diffutils\src\analyze.c">
- <Filter>DiffEngine</Filter>
- </ClCompile>
- <ClCompile Include="diffutils\lib\cmpbuf.c">
- <Filter>DiffEngine</Filter>
- </ClCompile>
- <ClCompile Include="diffutils\src\context.c">
- <Filter>DiffEngine</Filter>
- </ClCompile>
- <ClCompile Include="diffutils\src\Diff.cpp">
- <Filter>DiffEngine</Filter>
- </ClCompile>
- <ClCompile Include="diffutils\src\ed.c">
- <Filter>DiffEngine</Filter>
- </ClCompile>
- <ClCompile Include="diffutils\GnuVersion.c">
- <Filter>DiffEngine</Filter>
- </ClCompile>
- <ClCompile Include="diffutils\src\ifdef.c">
- <Filter>DiffEngine</Filter>
- </ClCompile>
- <ClCompile Include="diffutils\src\io.c">
- <Filter>DiffEngine</Filter>
- </ClCompile>
- <ClCompile Include="diffutils\src\normal.c">
- <Filter>DiffEngine</Filter>
- </ClCompile>
- <ClCompile Include="diffutils\src\side.c">
- <Filter>DiffEngine</Filter>
- </ClCompile>
- <ClCompile Include="diffutils\src\util.c">
- <Filter>DiffEngine</Filter>
- </ClCompile>
- <ClCompile Include="CompareEngines\ByteComparator.cpp">
- <Filter>Compare Engines</Filter>
- </ClCompile>
- <ClCompile Include="CompareEngines\ByteCompare.cpp">
- <Filter>Compare Engines</Filter>
- </ClCompile>
- <ClCompile Include="CompareEngines\DiffUtils.cpp">
- <Filter>Compare Engines</Filter>
- </ClCompile>
- <ClCompile Include="CompareEngines\TimeSizeCompare.cpp">
- <Filter>Compare Engines</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaleditview.cpp">
- <Filter>EditLib</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.cpp">
- <Filter>EditLib</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview.cpp">
- <Filter>EditLib</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview2.cpp">
- <Filter>EditLib</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\ceditreplacedlg.cpp">
- <Filter>EditLib</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\LineInfo.cpp">
- <Filter>EditLib</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\SyntaxColors.cpp">
- <Filter>EditLib</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\UndoRecord.cpp">
- <Filter>EditLib</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\ViewableWhitespace.cpp">
- <Filter>EditLib</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\cfindtextdlg.cpp">
- <Filter>EditLib</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\chcondlg.cpp">
- <Filter>EditLib</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\crystaleditviewex.cpp">
- <Filter>EditLib</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\crystalparser.cpp">
- <Filter>EditLib</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\crystaltextblock.cpp">
- <Filter>EditLib</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\cs2cs.cpp">
- <Filter>EditLib</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\filesup.cpp">
- <Filter>EditLib</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\fpattern.cpp">
- <Filter>EditLib</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\gotodlg.cpp">
- <Filter>EditLib</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\memcombo.cpp">
- <Filter>EditLib</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\registry.cpp">
- <Filter>EditLib</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\statbar.cpp">
- <Filter>EditLib</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\string_util.cpp">
- <Filter>EditLib</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\batch.cpp">
- <Filter>EditLib\parsers</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\asp.cpp">
- <Filter>EditLib\parsers</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\basic.cpp">
- <Filter>EditLib\parsers</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\cplusplus.cpp">
- <Filter>EditLib\parsers</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\csharp.cpp">
- <Filter>EditLib\parsers</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\css.cpp">
- <Filter>EditLib\parsers</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\dcl.cpp">
- <Filter>EditLib\parsers</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\fortran.cpp">
- <Filter>EditLib\parsers</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\html.cpp">
- <Filter>EditLib\parsers</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\ini.cpp">
- <Filter>EditLib\parsers</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\innosetup.cpp">
- <Filter>EditLib\parsers</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\java.cpp">
- <Filter>EditLib\parsers</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\is.cpp">
- <Filter>EditLib\parsers</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\lisp.cpp">
- <Filter>EditLib\parsers</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\nsis.cpp">
- <Filter>EditLib\parsers</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\perl.cpp">
- <Filter>EditLib\parsers</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\pascal.cpp">
- <Filter>EditLib\parsers</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\php.cpp">
- <Filter>EditLib\parsers</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\po.cpp">
- <Filter>EditLib\parsers</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\powershell.cpp">
- <Filter>EditLib\parsers</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\python.cpp">
- <Filter>EditLib\parsers</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\rexx.cpp">
- <Filter>EditLib\parsers</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\rsrc.cpp">
- <Filter>EditLib\parsers</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\sgml.cpp">
- <Filter>EditLib\parsers</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\ruby.cpp">
- <Filter>EditLib\parsers</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\sh.cpp">
- <Filter>EditLib\parsers</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\siod.cpp">
- <Filter>EditLib\parsers</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\sql.cpp">
- <Filter>EditLib\parsers</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\tcl.cpp">
- <Filter>EditLib\parsers</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\tex.cpp">
- <Filter>EditLib\parsers</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\verilog.cpp">
- <Filter>EditLib\parsers</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\xml.cpp">
- <Filter>EditLib\parsers</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\cregexp_poco.cpp">
- <Filter>EditLib</Filter>
- </ClCompile>
- <ClCompile Include="MergeApp.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="7zCommon.cpp">
- <Filter>MFCGui\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="ChildFrm.cpp">
- <Filter>MFCGui\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="Common\CMoveConstraint.cpp">
- <Filter>MFCGui\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="Common\ColorButton.cpp">
- <Filter>MFCGui\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="DiffTextBuffer.cpp">
- <Filter>MFCGui\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="DiffViewBar.cpp">
- <Filter>MFCGui\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="DirDoc.cpp">
- <Filter>MFCGui\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="DirFrame.cpp">
- <Filter>MFCGui\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="DirView.cpp">
- <Filter>MFCGui\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="EditorFilepathBar.cpp">
- <Filter>MFCGui\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="EncodingErrorBar.cpp">
- <Filter>MFCGui\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="FileActionScript.cpp">
- <Filter>MFCGui\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="FileOrFolderSelect.cpp">
- <Filter>MFCGui\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="FilepathEdit.cpp">
- <Filter>MFCGui\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="GhostTextBuffer.cpp">
- <Filter>MFCGui\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="GhostTextView.cpp">
- <Filter>MFCGui\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="HexMergeDoc.cpp">
- <Filter>MFCGui\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="HexMergeFrm.cpp">
- <Filter>MFCGui\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="HexMergeView.cpp">
- <Filter>MFCGui\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="LocationBar.cpp">
- <Filter>MFCGui\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="LocationView.cpp">
- <Filter>MFCGui\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="MainFrm.cpp">
- <Filter>MFCGui\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="Merge.cpp">
- <Filter>MFCGui\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="MergeDoc.cpp">
- <Filter>MFCGui\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="MergeDocDiffSync.cpp">
- <Filter>MFCGui\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="MergeDocEncoding.cpp">
- <Filter>MFCGui\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="MergeDocLineDiffs.cpp">
- <Filter>MFCGui\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="MergeEditView.cpp">
- <Filter>MFCGui\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="OpenDoc.cpp">
- <Filter>MFCGui\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="OpenFrm.cpp">
- <Filter>MFCGui\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="OpenView.cpp">
- <Filter>MFCGui\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="StdAfx.cpp">
- <Filter>MFCGui\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="Common\LanguageSelect.cpp">
- <Filter>MFCGui\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="Common\ExConverter.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="DirCompProgressBar.cpp">
- <Filter>MFCGui\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="OptionsFont.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="OptionsSyntaxColors.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="OptionsDiffColors.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="OptionsDiffOptions.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="PropVss.cpp">
- <Filter>MFCGui\Dialogs\PropertyPages</Filter>
- </ClCompile>
- <ClCompile Include="PropArchive.cpp">
- <Filter>MFCGui\Dialogs\PropertyPages</Filter>
- </ClCompile>
- <ClCompile Include="PropBackups.cpp">
- <Filter>MFCGui\Dialogs\PropertyPages</Filter>
- </ClCompile>
- <ClCompile Include="PropCodepage.cpp">
- <Filter>MFCGui\Dialogs\PropertyPages</Filter>
- </ClCompile>
- <ClCompile Include="PropColors.cpp">
- <Filter>MFCGui\Dialogs\PropertyPages</Filter>
- </ClCompile>
- <ClCompile Include="PropCompare.cpp">
- <Filter>MFCGui\Dialogs\PropertyPages</Filter>
- </ClCompile>
- <ClCompile Include="PropCompareFolder.cpp">
- <Filter>MFCGui\Dialogs\PropertyPages</Filter>
- </ClCompile>
- <ClCompile Include="PropEditor.cpp">
- <Filter>MFCGui\Dialogs\PropertyPages</Filter>
- </ClCompile>
- <ClCompile Include="PropGeneral.cpp">
- <Filter>MFCGui\Dialogs\PropertyPages</Filter>
- </ClCompile>
- <ClCompile Include="PropRegistry.cpp">
- <Filter>MFCGui\Dialogs\PropertyPages</Filter>
- </ClCompile>
- <ClCompile Include="PropShell.cpp">
- <Filter>MFCGui\Dialogs\PropertyPages</Filter>
- </ClCompile>
- <ClCompile Include="PropSyntaxColors.cpp">
- <Filter>MFCGui\Dialogs\PropertyPages</Filter>
- </ClCompile>
- <ClCompile Include="PropTextColors.cpp">
- <Filter>MFCGui\Dialogs\PropertyPages</Filter>
- </ClCompile>
- <ClCompile Include="AboutDlg.cpp">
- <Filter>MFCGui\Dialogs</Filter>
- </ClCompile>
- <ClCompile Include="DirCmpReportDlg.cpp">
- <Filter>MFCGui\Dialogs</Filter>
- </ClCompile>
- <ClCompile Include="DirColsDlg.cpp">
- <Filter>MFCGui\Dialogs</Filter>
- </ClCompile>
- <ClCompile Include="LineFiltersDlg.cpp">
- <Filter>MFCGui\Dialogs</Filter>
- </ClCompile>
- <ClCompile Include="LoadSaveCodepageDlg.cpp">
- <Filter>MFCGui\Dialogs</Filter>
- </ClCompile>
- <ClCompile Include="PatchDlg.cpp">
- <Filter>MFCGui\Dialogs</Filter>
- </ClCompile>
- <ClCompile Include="PluginsListDlg.cpp">
- <Filter>MFCGui\Dialogs</Filter>
- </ClCompile>
- <ClCompile Include="ProjectFilePathsDlg.cpp">
- <Filter>MFCGui\Dialogs</Filter>
- </ClCompile>
- <ClCompile Include="SaveClosingDlg.cpp">
- <Filter>MFCGui\Dialogs</Filter>
- </ClCompile>
- <ClCompile Include="SelectUnpackerDlg.cpp">
- <Filter>MFCGui\Dialogs</Filter>
- </ClCompile>
- <ClCompile Include="SharedFilterDlg.cpp">
- <Filter>MFCGui\Dialogs</Filter>
- </ClCompile>
- <ClCompile Include="TestFilterDlg.cpp">
- <Filter>MFCGui\Dialogs</Filter>
- </ClCompile>
- <ClCompile Include="WMGotoDlg.cpp">
- <Filter>MFCGui\Dialogs</Filter>
- </ClCompile>
- <ClCompile Include="FileFiltersDlg.cpp">
- <Filter>MFCGui\Dialogs</Filter>
- </ClCompile>
- <ClCompile Include="CompareStatisticsDlg.cpp">
- <Filter>MFCGui\Dialogs</Filter>
- </ClCompile>
- <ClCompile Include="ConfirmFolderCopyDlg.cpp">
- <Filter>MFCGui\Dialogs</Filter>
- </ClCompile>
- <ClCompile Include="PatchTool.cpp">
- <Filter>MFCGui\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="Common\SortHeaderCtrl.cpp">
- <Filter>MFCGui\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="Common\PreferencesDlg.cpp">
- <Filter>MFCGui\Dialogs</Filter>
- </ClCompile>
- <ClCompile Include="JumpList.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="Common\ClipBoard.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="OptionsCustomColors.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="Merge7zFormatShellImpl.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="ImgMergeFrm.cpp">
- <Filter>MFCGui\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="PropCompareImage.cpp">
- <Filter>MFCGui\Dialogs\PropertyPages</Filter>
- </ClCompile>
- <ClCompile Include="Merge7zFormatMergePluginImpl.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="LineFiltersList.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="CompareEngines\BinaryCompare.cpp">
- <Filter>Compare Engines</Filter>
- </ClCompile>
- <ClCompile Include="PropCompareBinary.cpp">
- <Filter>MFCGui\Dialogs\PropertyPages</Filter>
- </ClCompile>
- <ClCompile Include="SourceControl.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="DirViewColItems.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="DirActions.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="DropHandler.cpp">
- <Filter>MFCGui\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="OptionsDef.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="OptionsPanel.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="Common\scbarg.cpp">
- <Filter>MFCGui\Common</Filter>
- </ClCompile>
- <ClCompile Include="Common\scbarcf.cpp">
- <Filter>MFCGui\Common</Filter>
- </ClCompile>
- <ClCompile Include="Common\sizecbar.cpp">
- <Filter>MFCGui\Common</Filter>
- </ClCompile>
- <ClCompile Include="Common\BCMenu.cpp">
- <Filter>MFCGui\Common</Filter>
- </ClCompile>
- <ClCompile Include="Common\MDITabBar.cpp">
- <Filter>MFCGui\Common</Filter>
- </ClCompile>
- <ClCompile Include="Common\MessageBoxDialog.cpp">
- <Filter>MFCGui\Common</Filter>
- </ClCompile>
- <ClCompile Include="Common\SuperComboBox.cpp">
- <Filter>MFCGui\Common</Filter>
- </ClCompile>
- <ClCompile Include="Common\SplitterWndEx.cpp">
- <Filter>MFCGui\Common</Filter>
- </ClCompile>
- <ClCompile Include="Common\Bitmap.cpp">
- <Filter>MFCGui\Common</Filter>
- </ClCompile>
- <ClCompile Include="Common\Picture.cpp">
- <Filter>MFCGui\Common</Filter>
- </ClCompile>
- <ClCompile Include="VssPromptDlg.cpp">
- <Filter>MFCGui\Dialogs</Filter>
- </ClCompile>
- <ClCompile Include="Common\ShellContextMenu.cpp">
- <Filter>MFCGui\Common</Filter>
- </ClCompile>
- <ClCompile Include="Common\PropertyPageHost.cpp">
- <Filter>MFCGui\Common</Filter>
- </ClCompile>
- <ClCompile Include="CCPromptDlg.cpp">
- <Filter>MFCGui\Dialogs</Filter>
- </ClCompile>
- <ClCompile Include="TrDialogs.cpp">
- <Filter>MFCGui\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="MergeStatusBar.cpp">
- <Filter>MFCGui\Source Files</Filter>
- </ClCompile>
- <ClCompile Include="diffutils\src\mystat.cpp">
- <Filter>DiffEngine</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\go.cpp">
- <Filter>EditLib\parsers</Filter>
- </ClCompile>
- <ClCompile Include="..\Externals\crystaledit\editlib\rust.cpp">
- <Filter>EditLib\parsers</Filter>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="charsets.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="codepage_detect.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="CompareOptions.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="CompareStats.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="ConfigLog.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="ConflictFileParser.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="Common\coretools.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="DiffContext.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="DiffFileData.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="DiffFileInfo.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="DiffItem.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="DiffItemList.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="DiffList.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="DiffThread.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="DiffWrapper.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="DirCmpReport.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="DirItem.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="DirReportTypes.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="DirScan.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="DirTravel.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="dllpstub.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="Environment.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="Exceptions.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="FileFilter.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="FileFilterHelper.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="FileFilterMgr.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="FileLocation.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="files.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="FileTextEncoding.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="FileTextStats.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="FileTransform.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="FileVersion.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="FilterCommentsManager.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="FilterList.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="FolderCmp.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="IAbortable.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="IntToIntMap.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="LineFiltersList.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="locality.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="Common\lwdisp.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="markdown.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="MergeCmdLineInfo.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="MovedLines.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="Common\multiformatText.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="OptionsDef.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="common\OptionsMgr.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="PatchHTML.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="PathContext.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="paths.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="Common\PidlContainer.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="PluginManager.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="Plugins.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="ProjectFile.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="Common\RegKey.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="Common\RegOptionsMgr.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="Common\ShellFileOperations.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="ssapi.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="stringdiffs.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="stringdiffsi.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="TempFile.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="Common\unicoder.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="Common\UnicodeString.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="Common\UniFile.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="UniMarkdownFile.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="Common\varprop.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="Common\version.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="VSSHelper.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="diffutils\lib\cmpbuf.h">
- <Filter>DiffEngine</Filter>
- </ClInclude>
- <ClInclude Include="diffutils\config.h">
- <Filter>DiffEngine</Filter>
- </ClInclude>
- <ClInclude Include="diffutils\src\diff.h">
- <Filter>DiffEngine</Filter>
- </ClInclude>
- <ClInclude Include="diffutils\src\system.h">
- <Filter>DiffEngine</Filter>
- </ClInclude>
- <ClInclude Include="CompareEngines\ByteComparator.h">
- <Filter>Compare Engines</Filter>
- </ClInclude>
- <ClInclude Include="CompareEngines\ByteCompare.h">
- <Filter>Compare Engines</Filter>
- </ClInclude>
- <ClInclude Include="CompareEngines\DiffUtils.h">
- <Filter>Compare Engines</Filter>
- </ClInclude>
- <ClInclude Include="CompareEngines\TimeSizeCompare.h">
- <Filter>Compare Engines</Filter>
- </ClInclude>
- <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaleditview.h">
- <Filter>EditLib</Filter>
- </ClInclude>
- <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.h">
- <Filter>EditLib</Filter>
- </ClInclude>
- <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextview.h">
- <Filter>EditLib</Filter>
- </ClInclude>
- <ClInclude Include="..\Externals\crystaledit\editlib\ceditreplacedlg.h">
- <Filter>EditLib</Filter>
- </ClInclude>
- <ClInclude Include="..\Externals\crystaledit\editlib\LineInfo.h">
- <Filter>EditLib</Filter>
- </ClInclude>
- <ClInclude Include="..\Externals\crystaledit\editlib\SyntaxColors.h">
- <Filter>EditLib</Filter>
- </ClInclude>
- <ClInclude Include="..\Externals\crystaledit\editlib\UndoRecord.h">
- <Filter>EditLib</Filter>
- </ClInclude>
- <ClInclude Include="..\Externals\crystaledit\editlib\ViewableWhitespace.h">
- <Filter>EditLib</Filter>
- </ClInclude>
- <ClInclude Include="..\Externals\crystaledit\editlib\cfindtextdlg.h">
- <Filter>EditLib</Filter>
- </ClInclude>
- <ClInclude Include="..\Externals\crystaledit\editlib\chcondlg.h">
- <Filter>EditLib</Filter>
- </ClInclude>
- <ClInclude Include="..\Externals\crystaledit\editlib\cregexp.h">
- <Filter>EditLib</Filter>
- </ClInclude>
- <ClInclude Include="..\Externals\crystaledit\editlib\crystaleditviewex.h">
- <Filter>EditLib</Filter>
- </ClInclude>
- <ClInclude Include="..\Externals\crystaledit\editlib\crystalparser.h">
- <Filter>EditLib</Filter>
- </ClInclude>
- <ClInclude Include="..\Externals\crystaledit\editlib\crystaltextblock.h">
- <Filter>EditLib</Filter>
- </ClInclude>
- <ClInclude Include="..\Externals\crystaledit\editlib\cs2cs.h">
- <Filter>EditLib</Filter>
- </ClInclude>
- <ClInclude Include="..\Externals\crystaledit\editlib\editcmd.h">
- <Filter>EditLib</Filter>
- </ClInclude>
- <ClInclude Include="..\Externals\crystaledit\editlib\editreg.h">
- <Filter>EditLib</Filter>
- </ClInclude>
- <ClInclude Include="..\Externals\crystaledit\editlib\edtlib.h">
- <Filter>EditLib</Filter>
- </ClInclude>
- <ClInclude Include="..\Externals\crystaledit\editlib\filesup.h">
- <Filter>EditLib</Filter>
- </ClInclude>
- <ClInclude Include="..\Externals\crystaledit\editlib\fpattern.h">
- <Filter>EditLib</Filter>
- </ClInclude>
- <ClInclude Include="..\Externals\crystaledit\editlib\gotodlg.h">
- <Filter>EditLib</Filter>
- </ClInclude>
- <ClInclude Include="..\Externals\crystaledit\editlib\memcombo.h">
- <Filter>EditLib</Filter>
- </ClInclude>
- <ClInclude Include="..\Externals\crystaledit\editlib\registry.h">
- <Filter>EditLib</Filter>
- </ClInclude>
- <ClInclude Include="..\Externals\crystaledit\editlib\statbar.h">
- <Filter>EditLib</Filter>
- </ClInclude>
- <ClInclude Include="..\Externals\crystaledit\editlib\string_util.h">
- <Filter>EditLib</Filter>
- </ClInclude>
- <ClInclude Include="..\Externals\crystaledit\editlib\wispelld.h">
- <Filter>EditLib</Filter>
- </ClInclude>
- <ClInclude Include="StdAfx.h">
- <Filter>MFCGui\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="Resource.h">
- <Filter>MFCGui\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="OpenFrm.h">
- <Filter>MFCGui\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="OpenView.h">
- <Filter>MFCGui\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="OpenDoc.h">
- <Filter>MFCGui\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="MergeEditView.h">
- <Filter>MFCGui\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="MergeEditStatus.h">
- <Filter>MFCGui\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="MergeDoc.h">
- <Filter>MFCGui\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="Merge.h">
- <Filter>MFCGui\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="MainFrm.h">
- <Filter>MFCGui\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="LocationView.h">
- <Filter>MFCGui\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="LocationBar.h">
- <Filter>MFCGui\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="IOptionsPanel.h">
- <Filter>MFCGui\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="HexMergeFrm.h">
- <Filter>MFCGui\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="HexMergeDoc.h">
- <Filter>MFCGui\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="GhostTextView.h">
- <Filter>MFCGui\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="GhostTextBuffer.h">
- <Filter>MFCGui\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="FileOrFolderSelect.h">
- <Filter>MFCGui\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="ChildFrm.h">
- <Filter>MFCGui\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="DiffViewBar.h">
- <Filter>MFCGui\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="DiffTextBuffer.h">
- <Filter>MFCGui\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="DirDoc.h">
- <Filter>MFCGui\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="DirFrame.h">
- <Filter>MFCGui\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="DirView.h">
- <Filter>MFCGui\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="EditorFilepathBar.h">
- <Filter>MFCGui\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="EncodingErrorBar.h">
- <Filter>MFCGui\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="FileActionScript.h">
- <Filter>MFCGui\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="FilepathEdit.h">
- <Filter>MFCGui\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="Common\LanguageSelect.h">
- <Filter>MFCGui\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="Common\coretypes.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="IListCtrlImpl.h">
- <Filter>MFCGui\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="MergeLineFlags.h">
- <Filter>MFCGui\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="MergeApp.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="Common\ExConverter.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="DirCompProgressBar.h">
- <Filter>MFCGui\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="Diff3.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="OptionsFont.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="OptionsSyntaxColors.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="OptionsDiffColors.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="OptionsDiffOptions.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="PropArchive.h">
- <Filter>MFCGui\Dialogs\PropertyPages</Filter>
- </ClInclude>
- <ClInclude Include="PropVss.h">
- <Filter>MFCGui\Dialogs\PropertyPages</Filter>
- </ClInclude>
- <ClInclude Include="PropBackups.h">
- <Filter>MFCGui\Dialogs\PropertyPages</Filter>
- </ClInclude>
- <ClInclude Include="PropCodepage.h">
- <Filter>MFCGui\Dialogs\PropertyPages</Filter>
- </ClInclude>
- <ClInclude Include="PropColors.h">
- <Filter>MFCGui\Dialogs\PropertyPages</Filter>
- </ClInclude>
- <ClInclude Include="PropCompare.h">
- <Filter>MFCGui\Dialogs\PropertyPages</Filter>
- </ClInclude>
- <ClInclude Include="PropCompareFolder.h">
- <Filter>MFCGui\Dialogs\PropertyPages</Filter>
- </ClInclude>
- <ClInclude Include="PropEditor.h">
- <Filter>MFCGui\Dialogs\PropertyPages</Filter>
- </ClInclude>
- <ClInclude Include="PropGeneral.h">
- <Filter>MFCGui\Dialogs\PropertyPages</Filter>
- </ClInclude>
- <ClInclude Include="PropRegistry.h">
- <Filter>MFCGui\Dialogs\PropertyPages</Filter>
- </ClInclude>
- <ClInclude Include="PropShell.h">
- <Filter>MFCGui\Dialogs\PropertyPages</Filter>
- </ClInclude>
- <ClInclude Include="PropSyntaxColors.h">
- <Filter>MFCGui\Dialogs\PropertyPages</Filter>
- </ClInclude>
- <ClInclude Include="PropTextColors.h">
- <Filter>MFCGui\Dialogs\PropertyPages</Filter>
- </ClInclude>
- <ClInclude Include="AboutDlg.h">
- <Filter>MFCGui\Dialogs</Filter>
- </ClInclude>
- <ClInclude Include="CompareStatisticsDlg.h">
- <Filter>MFCGui\Dialogs</Filter>
- </ClInclude>
- <ClInclude Include="ConfirmFolderCopyDlg.h">
- <Filter>MFCGui\Dialogs</Filter>
- </ClInclude>
- <ClInclude Include="DirCmpReportDlg.h">
- <Filter>MFCGui\Dialogs</Filter>
- </ClInclude>
- <ClInclude Include="FileFiltersDlg.h">
- <Filter>MFCGui\Dialogs</Filter>
- </ClInclude>
- <ClInclude Include="LoadSaveCodepageDlg.h">
- <Filter>MFCGui\Dialogs</Filter>
- </ClInclude>
- <ClInclude Include="LineFiltersDlg.h">
- <Filter>MFCGui\Dialogs</Filter>
- </ClInclude>
- <ClInclude Include="PatchDlg.h">
- <Filter>MFCGui\Dialogs</Filter>
- </ClInclude>
- <ClInclude Include="PluginsListDlg.h">
- <Filter>MFCGui\Dialogs</Filter>
- </ClInclude>
- <ClInclude Include="SaveClosingDlg.h">
- <Filter>MFCGui\Dialogs</Filter>
- </ClInclude>
- <ClInclude Include="SelectUnpackerDlg.h">
- <Filter>MFCGui\Dialogs</Filter>
- </ClInclude>
- <ClInclude Include="SharedFilterDlg.h">
- <Filter>MFCGui\Dialogs</Filter>
- </ClInclude>
- <ClInclude Include="TestFilterDlg.h">
- <Filter>MFCGui\Dialogs</Filter>
- </ClInclude>
- <ClInclude Include="WMGotoDlg.h">
- <Filter>MFCGui\Dialogs</Filter>
- </ClInclude>
- <ClInclude Include="ProjectFilePathsDlg.h">
- <Filter>MFCGui\Dialogs</Filter>
- </ClInclude>
- <ClInclude Include="DirColsDlg.h">
- <Filter>MFCGui\Dialogs</Filter>
- </ClInclude>
- <ClInclude Include="PatchTool.h">
- <Filter>MFCGui\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="Common\PreferencesDlg.h">
- <Filter>MFCGui\Dialogs</Filter>
- </ClInclude>
- <ClInclude Include="JumpList.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="Common\ClipBoard.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="OptionsCustomColors.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="7zCommon.h">
- <Filter>MFCGui\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="Merge7zFormatShellImpl.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="ImgMergeFrm.h">
- <Filter>MFCGui\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="PropCompareImage.h">
- <Filter>MFCGui\Dialogs\PropertyPages</Filter>
- </ClInclude>
- <ClInclude Include="IMergeDoc.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="Merge7zFormatMergePluginImpl.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="Merge7zFormatRegister.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="CompareEngines\BinaryCompare.h">
- <Filter>Compare Engines</Filter>
- </ClInclude>
- <ClInclude Include="DirViewColItems.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="DirActions.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="HexMergeView.h">
- <Filter>MFCGui\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="PropCompareBinary.h">
- <Filter>MFCGui\Dialogs\PropertyPages</Filter>
- </ClInclude>
- <ClInclude Include="CCPromptDlg.h">
- <Filter>MFCGui\Dialogs</Filter>
- </ClInclude>
- <ClInclude Include="VssPromptDlg.h">
- <Filter>MFCGui\Dialogs</Filter>
- </ClInclude>
- <ClInclude Include="Common\SuperComboBox.h">
- <Filter>MFCGui\Common</Filter>
- </ClInclude>
- <ClInclude Include="Common\SortHeaderCtrl.h">
- <Filter>MFCGui\Common</Filter>
- </ClInclude>
- <ClInclude Include="Common\CMoveConstraint.h">
- <Filter>MFCGui\Common</Filter>
- </ClInclude>
- <ClInclude Include="Common\MDITabBar.h">
- <Filter>MFCGui\Common</Filter>
- </ClInclude>
- <ClInclude Include="Common\PropertyPageHost.h">
- <Filter>MFCGui\Common</Filter>
- </ClInclude>
- <ClInclude Include="Common\SplitterWndEx.h">
- <Filter>MFCGui\Common</Filter>
- </ClInclude>
- <ClInclude Include="Common\sizecbar.h">
- <Filter>MFCGui\Common</Filter>
- </ClInclude>
- <ClInclude Include="Common\scbarg.h">
- <Filter>MFCGui\Common</Filter>
- </ClInclude>
- <ClInclude Include="Common\scbarcf.h">
- <Filter>MFCGui\Common</Filter>
- </ClInclude>
- <ClInclude Include="Common\MessageBoxDialog.h">
- <Filter>MFCGui\Common</Filter>
- </ClInclude>
- <ClInclude Include="OptionsPanel.h">
- <Filter>MFCGui\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="Common\Bitmap.h">
- <Filter>MFCGui\Common</Filter>
- </ClInclude>
- <ClInclude Include="Common\memdc.h">
- <Filter>MFCGui\Common</Filter>
- </ClInclude>
- <ClInclude Include="Common\ShellContextMenu.h">
- <Filter>MFCGui\Common</Filter>
- </ClInclude>
- <ClInclude Include="Common\BCMenu.h">
- <Filter>MFCGui\Common</Filter>
- </ClInclude>
- <ClInclude Include="Common\ColorButton.h">
- <Filter>MFCGui\Common</Filter>
- </ClInclude>
- <ClInclude Include="Common\Picture.h">
- <Filter>MFCGui\Common</Filter>
- </ClInclude>
- <ClInclude Include="DropHandler.h">
- <Filter>MFCGui\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="Constants.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="SourceControl.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="OptionsInit.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="TrDialogs.h">
- <Filter>MFCGui\Header Files</Filter>
- </ClInclude>
- <ClInclude Include="MergeStatusBar.h">
- <Filter>MFCGui\Header Files</Filter>
- </ClInclude>
- </ItemGroup>
- <ItemGroup>
- <None Include="res\binarydiff.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\both.bmp">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\equalbinary.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\equalfile.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\error.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\fileskip.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\folder.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\folderskip.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\folderup.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\folderup_disable.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\hand.cur">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\left.bmp">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\left_to_browse.bmp">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\left_to_right.bmp">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\lfile.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\lfolder.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\Merge.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\Merge.rc2">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\MergeDir.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\MergeDoc.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\MergeProject.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\mg_cur.cur">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\move_left_to_browse.bmp">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\move_right_to_browse.bmp">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\notequalfile.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\rfile.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\rfolder.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\right.bmp">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\right_to_browse.bmp">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\right_to_left.bmp">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\sigma.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="CHANGELO">
- <Filter>ChangeLogs</Filter>
- </None>
- <None Include="..\Docs\Users\ChangeLog.txt">
- <Filter>ChangeLogs</Filter>
- </None>
- <None Include="..\Externals\crystaledit\editlib\ccrystaleditview.inl">
- <Filter>EditLib</Filter>
- </None>
- <None Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.inl">
- <Filter>EditLib</Filter>
- </None>
- <None Include="..\Externals\crystaledit\editlib\ccrystaltextview.inl">
- <Filter>EditLib</Filter>
- </None>
- <None Include="..\Externals\crystaledit\editlib\filesup.inl">
- <Filter>EditLib</Filter>
- </None>
- <None Include="..\Externals\crystaledit\editlib\memcombo.inl">
- <Filter>EditLib</Filter>
- </None>
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="Merge.rc">
- <Filter>MFCGui\Source Files</Filter>
- </ResourceCompile>
- </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+ <ItemGroup>\r
+ <Filter Include="Source Files">\r
+ <UniqueIdentifier>{e8f63c02-8bf9-425d-88d0-831ca188bbdf}</UniqueIdentifier>\r
+ <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>\r
+ </Filter>\r
+ <Filter Include="Header Files">\r
+ <UniqueIdentifier>{ff78af1d-3eee-4c01-8be1-27cf73dfe922}</UniqueIdentifier>\r
+ <Extensions>h;hpp;hxx;hm;inl</Extensions>\r
+ </Filter>\r
+ <Filter Include="Resource Files">\r
+ <UniqueIdentifier>{4e04f59d-bb70-4e67-a8d7-2b01fb6d0cd8}</UniqueIdentifier>\r
+ <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>\r
+ </Filter>\r
+ <Filter Include="EditLib">\r
+ <UniqueIdentifier>{84d4664c-e7ea-4d24-8d55-b1303c40b7f4}</UniqueIdentifier>\r
+ </Filter>\r
+ <Filter Include="DiffEngine">\r
+ <UniqueIdentifier>{16e1af2b-75c9-4deb-b49f-819018df0478}</UniqueIdentifier>\r
+ </Filter>\r
+ <Filter Include="ChangeLogs">\r
+ <UniqueIdentifier>{aefb7247-d6e5-411d-9cc5-4a12f5efda4a}</UniqueIdentifier>\r
+ </Filter>\r
+ <Filter Include="Compare Engines">\r
+ <UniqueIdentifier>{b889169f-de55-4db7-ad06-423f6438fa90}</UniqueIdentifier>\r
+ <Extensions>cpp;c;h</Extensions>\r
+ </Filter>\r
+ <Filter Include="EditLib\parsers">\r
+ <UniqueIdentifier>{740d4dd9-ab31-47b8-9cbb-8e6a7b5db4fe}</UniqueIdentifier>\r
+ </Filter>\r
+ <Filter Include="MFCGui">\r
+ <UniqueIdentifier>{caf52667-921a-47aa-84a3-f277aac15107}</UniqueIdentifier>\r
+ </Filter>\r
+ <Filter Include="MFCGui\Source Files">\r
+ <UniqueIdentifier>{5dc3ba0d-6755-48f8-ad11-df56b167b514}</UniqueIdentifier>\r
+ </Filter>\r
+ <Filter Include="MFCGui\Header Files">\r
+ <UniqueIdentifier>{10ce7aff-bcfd-4ed0-98c3-766226c4c89e}</UniqueIdentifier>\r
+ </Filter>\r
+ <Filter Include="MFCGui\Dialogs">\r
+ <UniqueIdentifier>{d520b3a7-c530-4053-8766-07c26ed85f85}</UniqueIdentifier>\r
+ </Filter>\r
+ <Filter Include="MFCGui\Dialogs\PropertyPages">\r
+ <UniqueIdentifier>{c6b39fdf-7c68-42c3-895b-da25bb6e51b4}</UniqueIdentifier>\r
+ </Filter>\r
+ <Filter Include="MFCGui\Common">\r
+ <UniqueIdentifier>{297182f0-e39d-4ac4-9df3-315882ce9e07}</UniqueIdentifier>\r
+ </Filter>\r
+ </ItemGroup>\r
+ <ItemGroup>\r
+ <ClCompile Include="charsets.c">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="codepage_detect.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="CompareOptions.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="CompareStats.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="ConfigLog.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="ConflictFileParser.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="Common\coretools.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="DiffContext.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="DiffFileData.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="DiffFileInfo.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="DiffItem.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="DiffItemList.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="DiffList.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="DiffThread.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="DiffWrapper.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="DirCmpReport.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="DirItem.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="DirScan.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="DirTravel.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="dllpstub.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="Environment.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="FileFilter.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="FileFilterHelper.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="FileFilterMgr.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="FileTextEncoding.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="FileTransform.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="FileVersion.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="FilterCommentsManager.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="FilterList.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="FolderCmp.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="locality.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="Common\lwdisp.c">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="markdown.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="MergeCmdLineInfo.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="MovedBlocks.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="MovedLines.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="Common\multiformatText.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="OptionsInit.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="common\OptionsMgr.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="PatchHTML.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="PathContext.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="paths.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="Common\PidlContainer.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="PluginManager.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="Plugins.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="ProjectFile.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="Common\RegKey.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="Common\RegOptionsMgr.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="Common\ShellFileOperations.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="stringdiffs.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="TempFile.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="Common\unicoder.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="Common\UnicodeString.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="Common\UniFile.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="UniMarkdownFile.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="Common\varprop.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="Common\version.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="VSSHelper.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="diffutils\src\analyze.c">\r
+ <Filter>DiffEngine</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="diffutils\lib\cmpbuf.c">\r
+ <Filter>DiffEngine</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="diffutils\src\context.c">\r
+ <Filter>DiffEngine</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="diffutils\src\Diff.cpp">\r
+ <Filter>DiffEngine</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="diffutils\src\ed.c">\r
+ <Filter>DiffEngine</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="diffutils\GnuVersion.c">\r
+ <Filter>DiffEngine</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="diffutils\src\ifdef.c">\r
+ <Filter>DiffEngine</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="diffutils\src\io.c">\r
+ <Filter>DiffEngine</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="diffutils\src\normal.c">\r
+ <Filter>DiffEngine</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="diffutils\src\side.c">\r
+ <Filter>DiffEngine</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="diffutils\src\util.c">\r
+ <Filter>DiffEngine</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\DiffUtils.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\xml.cpp">\r
+ <Filter>EditLib\parsers</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\cregexp_poco.cpp">\r
+ <Filter>EditLib</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="MergeApp.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="7zCommon.cpp">\r
+ <Filter>MFCGui\Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="ChildFrm.cpp">\r
+ <Filter>MFCGui\Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="Common\CMoveConstraint.cpp">\r
+ <Filter>MFCGui\Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="Common\ColorButton.cpp">\r
+ <Filter>MFCGui\Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="DiffTextBuffer.cpp">\r
+ <Filter>MFCGui\Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="DiffViewBar.cpp">\r
+ <Filter>MFCGui\Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="DirDoc.cpp">\r
+ <Filter>MFCGui\Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="DirFrame.cpp">\r
+ <Filter>MFCGui\Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="DirView.cpp">\r
+ <Filter>MFCGui\Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="EditorFilepathBar.cpp">\r
+ <Filter>MFCGui\Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="EncodingErrorBar.cpp">\r
+ <Filter>MFCGui\Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="FileActionScript.cpp">\r
+ <Filter>MFCGui\Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="FileOrFolderSelect.cpp">\r
+ <Filter>MFCGui\Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="FilepathEdit.cpp">\r
+ <Filter>MFCGui\Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="GhostTextBuffer.cpp">\r
+ <Filter>MFCGui\Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="GhostTextView.cpp">\r
+ <Filter>MFCGui\Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="HexMergeDoc.cpp">\r
+ <Filter>MFCGui\Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="HexMergeFrm.cpp">\r
+ <Filter>MFCGui\Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="HexMergeView.cpp">\r
+ <Filter>MFCGui\Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="LocationBar.cpp">\r
+ <Filter>MFCGui\Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="LocationView.cpp">\r
+ <Filter>MFCGui\Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="MainFrm.cpp">\r
+ <Filter>MFCGui\Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="Merge.cpp">\r
+ <Filter>MFCGui\Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="MergeDoc.cpp">\r
+ <Filter>MFCGui\Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="MergeDocDiffSync.cpp">\r
+ <Filter>MFCGui\Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="MergeDocEncoding.cpp">\r
+ <Filter>MFCGui\Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="MergeDocLineDiffs.cpp">\r
+ <Filter>MFCGui\Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="MergeEditView.cpp">\r
+ <Filter>MFCGui\Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="OpenDoc.cpp">\r
+ <Filter>MFCGui\Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="OpenFrm.cpp">\r
+ <Filter>MFCGui\Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="OpenView.cpp">\r
+ <Filter>MFCGui\Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="StdAfx.cpp">\r
+ <Filter>MFCGui\Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="Common\LanguageSelect.cpp">\r
+ <Filter>MFCGui\Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="Common\ExConverter.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="DirCompProgressBar.cpp">\r
+ <Filter>MFCGui\Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="OptionsFont.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="OptionsSyntaxColors.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="OptionsDiffColors.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="OptionsDiffOptions.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="PropVss.cpp">\r
+ <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="PropArchive.cpp">\r
+ <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="PropBackups.cpp">\r
+ <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="PropCodepage.cpp">\r
+ <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="PropColors.cpp">\r
+ <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="PropCompare.cpp">\r
+ <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="PropCompareFolder.cpp">\r
+ <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="PropEditor.cpp">\r
+ <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="PropGeneral.cpp">\r
+ <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="PropRegistry.cpp">\r
+ <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="PropShell.cpp">\r
+ <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="PropSyntaxColors.cpp">\r
+ <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="PropTextColors.cpp">\r
+ <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="AboutDlg.cpp">\r
+ <Filter>MFCGui\Dialogs</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="DirCmpReportDlg.cpp">\r
+ <Filter>MFCGui\Dialogs</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="DirColsDlg.cpp">\r
+ <Filter>MFCGui\Dialogs</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="LineFiltersDlg.cpp">\r
+ <Filter>MFCGui\Dialogs</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="LoadSaveCodepageDlg.cpp">\r
+ <Filter>MFCGui\Dialogs</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="PatchDlg.cpp">\r
+ <Filter>MFCGui\Dialogs</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="PluginsListDlg.cpp">\r
+ <Filter>MFCGui\Dialogs</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="ProjectFilePathsDlg.cpp">\r
+ <Filter>MFCGui\Dialogs</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="SaveClosingDlg.cpp">\r
+ <Filter>MFCGui\Dialogs</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="SelectUnpackerDlg.cpp">\r
+ <Filter>MFCGui\Dialogs</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="SharedFilterDlg.cpp">\r
+ <Filter>MFCGui\Dialogs</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="TestFilterDlg.cpp">\r
+ <Filter>MFCGui\Dialogs</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="WMGotoDlg.cpp">\r
+ <Filter>MFCGui\Dialogs</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="FileFiltersDlg.cpp">\r
+ <Filter>MFCGui\Dialogs</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="CompareStatisticsDlg.cpp">\r
+ <Filter>MFCGui\Dialogs</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="ConfirmFolderCopyDlg.cpp">\r
+ <Filter>MFCGui\Dialogs</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="PatchTool.cpp">\r
+ <Filter>MFCGui\Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="Common\SortHeaderCtrl.cpp">\r
+ <Filter>MFCGui\Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="Common\PreferencesDlg.cpp">\r
+ <Filter>MFCGui\Dialogs</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="JumpList.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="Common\ClipBoard.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="OptionsCustomColors.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="Merge7zFormatShellImpl.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="ImgMergeFrm.cpp">\r
+ <Filter>MFCGui\Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="PropCompareImage.cpp">\r
+ <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="Merge7zFormatMergePluginImpl.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="LineFiltersList.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="CompareEngines\BinaryCompare.cpp">\r
+ <Filter>Compare Engines</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="PropCompareBinary.cpp">\r
+ <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="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="DropHandler.cpp">\r
+ <Filter>MFCGui\Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="OptionsDef.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="OptionsPanel.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="Common\scbarg.cpp">\r
+ <Filter>MFCGui\Common</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="Common\scbarcf.cpp">\r
+ <Filter>MFCGui\Common</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="Common\sizecbar.cpp">\r
+ <Filter>MFCGui\Common</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="Common\BCMenu.cpp">\r
+ <Filter>MFCGui\Common</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="Common\MDITabBar.cpp">\r
+ <Filter>MFCGui\Common</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="Common\MessageBoxDialog.cpp">\r
+ <Filter>MFCGui\Common</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="Common\SuperComboBox.cpp">\r
+ <Filter>MFCGui\Common</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="Common\SplitterWndEx.cpp">\r
+ <Filter>MFCGui\Common</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="Common\Bitmap.cpp">\r
+ <Filter>MFCGui\Common</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="Common\Picture.cpp">\r
+ <Filter>MFCGui\Common</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="VssPromptDlg.cpp">\r
+ <Filter>MFCGui\Dialogs</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="Common\ShellContextMenu.cpp">\r
+ <Filter>MFCGui\Common</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="Common\PropertyPageHost.cpp">\r
+ <Filter>MFCGui\Common</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="CCPromptDlg.cpp">\r
+ <Filter>MFCGui\Dialogs</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="TrDialogs.cpp">\r
+ <Filter>MFCGui\Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="MergeStatusBar.cpp">\r
+ <Filter>MFCGui\Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="diffutils\src\mystat.cpp">\r
+ <Filter>DiffEngine</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\go.cpp">\r
+ <Filter>EditLib\parsers</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\rust.cpp">\r
+ <Filter>EditLib\parsers</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="Test.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="TestMain.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.cpp">\r
+ <Filter>EditLib</Filter>\r
+ </ClCompile>\r
+ <ClCompile Include="PropMarkerColors.cpp">\r
+ <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+ </ClCompile>\r
+ </ItemGroup>\r
+ <ItemGroup>\r
+ <ClInclude Include="charsets.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="codepage_detect.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="CompareOptions.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="CompareStats.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="ConfigLog.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="ConflictFileParser.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="Common\coretools.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="DiffContext.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="DiffFileData.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="DiffFileInfo.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="DiffItem.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="DiffItemList.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="DiffList.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="DiffThread.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="DiffWrapper.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="DirCmpReport.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="DirItem.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="DirReportTypes.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="DirScan.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="DirTravel.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="dllpstub.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="Environment.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="Exceptions.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="FileFilter.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="FileFilterHelper.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="FileFilterMgr.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="FileLocation.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="files.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="FileTextEncoding.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="FileTextStats.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="FileTransform.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="FileVersion.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="FilterCommentsManager.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="FilterList.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="FolderCmp.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="IAbortable.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="IntToIntMap.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="LineFiltersList.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="locality.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="Common\lwdisp.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="markdown.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="MergeCmdLineInfo.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="MovedLines.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="Common\multiformatText.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="OptionsDef.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="common\OptionsMgr.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="PatchHTML.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="PathContext.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="paths.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="Common\PidlContainer.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="PluginManager.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="Plugins.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="ProjectFile.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="Common\RegKey.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="Common\RegOptionsMgr.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="Common\ShellFileOperations.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="ssapi.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="stringdiffs.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="stringdiffsi.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="TempFile.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="Common\unicoder.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="Common\UnicodeString.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="Common\UniFile.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="UniMarkdownFile.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="Common\varprop.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="Common\version.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="VSSHelper.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="diffutils\lib\cmpbuf.h">\r
+ <Filter>DiffEngine</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="diffutils\config.h">\r
+ <Filter>DiffEngine</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="diffutils\src\diff.h">\r
+ <Filter>DiffEngine</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="diffutils\src\system.h">\r
+ <Filter>DiffEngine</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\DiffUtils.h">\r
+ <Filter>Compare Engines</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="CompareEngines\TimeSizeCompare.h">\r
+ <Filter>Compare Engines</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaleditview.h">\r
+ <Filter>EditLib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.h">\r
+ <Filter>EditLib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextview.h">\r
+ <Filter>EditLib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\ceditreplacedlg.h">\r
+ <Filter>EditLib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\LineInfo.h">\r
+ <Filter>EditLib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\SyntaxColors.h">\r
+ <Filter>EditLib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\UndoRecord.h">\r
+ <Filter>EditLib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\ViewableWhitespace.h">\r
+ <Filter>EditLib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\cfindtextdlg.h">\r
+ <Filter>EditLib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\chcondlg.h">\r
+ <Filter>EditLib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\cregexp.h">\r
+ <Filter>EditLib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\crystaleditviewex.h">\r
+ <Filter>EditLib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\crystalparser.h">\r
+ <Filter>EditLib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\crystaltextblock.h">\r
+ <Filter>EditLib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\cs2cs.h">\r
+ <Filter>EditLib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\editcmd.h">\r
+ <Filter>EditLib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\editreg.h">\r
+ <Filter>EditLib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\edtlib.h">\r
+ <Filter>EditLib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\filesup.h">\r
+ <Filter>EditLib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\fpattern.h">\r
+ <Filter>EditLib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\gotodlg.h">\r
+ <Filter>EditLib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\memcombo.h">\r
+ <Filter>EditLib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\registry.h">\r
+ <Filter>EditLib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\statbar.h">\r
+ <Filter>EditLib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\string_util.h">\r
+ <Filter>EditLib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\wispelld.h">\r
+ <Filter>EditLib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="StdAfx.h">\r
+ <Filter>MFCGui\Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="Resource.h">\r
+ <Filter>MFCGui\Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="OpenFrm.h">\r
+ <Filter>MFCGui\Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="OpenView.h">\r
+ <Filter>MFCGui\Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="OpenDoc.h">\r
+ <Filter>MFCGui\Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="MergeEditView.h">\r
+ <Filter>MFCGui\Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="MergeEditStatus.h">\r
+ <Filter>MFCGui\Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="MergeDoc.h">\r
+ <Filter>MFCGui\Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="Merge.h">\r
+ <Filter>MFCGui\Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="MainFrm.h">\r
+ <Filter>MFCGui\Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="LocationView.h">\r
+ <Filter>MFCGui\Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="LocationBar.h">\r
+ <Filter>MFCGui\Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="IOptionsPanel.h">\r
+ <Filter>MFCGui\Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="HexMergeFrm.h">\r
+ <Filter>MFCGui\Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="HexMergeDoc.h">\r
+ <Filter>MFCGui\Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="GhostTextView.h">\r
+ <Filter>MFCGui\Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="GhostTextBuffer.h">\r
+ <Filter>MFCGui\Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="FileOrFolderSelect.h">\r
+ <Filter>MFCGui\Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="ChildFrm.h">\r
+ <Filter>MFCGui\Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="DiffViewBar.h">\r
+ <Filter>MFCGui\Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="DiffTextBuffer.h">\r
+ <Filter>MFCGui\Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="DirDoc.h">\r
+ <Filter>MFCGui\Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="DirFrame.h">\r
+ <Filter>MFCGui\Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="DirView.h">\r
+ <Filter>MFCGui\Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="EditorFilepathBar.h">\r
+ <Filter>MFCGui\Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="EncodingErrorBar.h">\r
+ <Filter>MFCGui\Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="FileActionScript.h">\r
+ <Filter>MFCGui\Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="FilepathEdit.h">\r
+ <Filter>MFCGui\Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="Common\LanguageSelect.h">\r
+ <Filter>MFCGui\Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="Common\coretypes.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="IListCtrlImpl.h">\r
+ <Filter>MFCGui\Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="MergeLineFlags.h">\r
+ <Filter>MFCGui\Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="MergeApp.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="Common\ExConverter.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="DirCompProgressBar.h">\r
+ <Filter>MFCGui\Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="Diff3.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="OptionsFont.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="OptionsSyntaxColors.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="OptionsDiffColors.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="OptionsDiffOptions.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="PropArchive.h">\r
+ <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="PropVss.h">\r
+ <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="PropBackups.h">\r
+ <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="PropCodepage.h">\r
+ <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="PropColors.h">\r
+ <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="PropCompare.h">\r
+ <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="PropCompareFolder.h">\r
+ <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="PropEditor.h">\r
+ <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="PropGeneral.h">\r
+ <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="PropRegistry.h">\r
+ <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="PropShell.h">\r
+ <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="PropSyntaxColors.h">\r
+ <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="PropTextColors.h">\r
+ <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="AboutDlg.h">\r
+ <Filter>MFCGui\Dialogs</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="CompareStatisticsDlg.h">\r
+ <Filter>MFCGui\Dialogs</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="ConfirmFolderCopyDlg.h">\r
+ <Filter>MFCGui\Dialogs</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="DirCmpReportDlg.h">\r
+ <Filter>MFCGui\Dialogs</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="FileFiltersDlg.h">\r
+ <Filter>MFCGui\Dialogs</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="LoadSaveCodepageDlg.h">\r
+ <Filter>MFCGui\Dialogs</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="LineFiltersDlg.h">\r
+ <Filter>MFCGui\Dialogs</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="PatchDlg.h">\r
+ <Filter>MFCGui\Dialogs</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="PluginsListDlg.h">\r
+ <Filter>MFCGui\Dialogs</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="SaveClosingDlg.h">\r
+ <Filter>MFCGui\Dialogs</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="SelectUnpackerDlg.h">\r
+ <Filter>MFCGui\Dialogs</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="SharedFilterDlg.h">\r
+ <Filter>MFCGui\Dialogs</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="TestFilterDlg.h">\r
+ <Filter>MFCGui\Dialogs</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="WMGotoDlg.h">\r
+ <Filter>MFCGui\Dialogs</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="ProjectFilePathsDlg.h">\r
+ <Filter>MFCGui\Dialogs</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="DirColsDlg.h">\r
+ <Filter>MFCGui\Dialogs</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="PatchTool.h">\r
+ <Filter>MFCGui\Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="Common\PreferencesDlg.h">\r
+ <Filter>MFCGui\Dialogs</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="JumpList.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="Common\ClipBoard.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="OptionsCustomColors.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="7zCommon.h">\r
+ <Filter>MFCGui\Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="Merge7zFormatShellImpl.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="ImgMergeFrm.h">\r
+ <Filter>MFCGui\Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="PropCompareImage.h">\r
+ <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="IMergeDoc.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="Merge7zFormatMergePluginImpl.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="Merge7zFormatRegister.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="CompareEngines\BinaryCompare.h">\r
+ <Filter>Compare Engines</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="DirViewColItems.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="DirActions.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="HexMergeView.h">\r
+ <Filter>MFCGui\Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="PropCompareBinary.h">\r
+ <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="CCPromptDlg.h">\r
+ <Filter>MFCGui\Dialogs</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="VssPromptDlg.h">\r
+ <Filter>MFCGui\Dialogs</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="Common\SuperComboBox.h">\r
+ <Filter>MFCGui\Common</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="Common\SortHeaderCtrl.h">\r
+ <Filter>MFCGui\Common</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="Common\CMoveConstraint.h">\r
+ <Filter>MFCGui\Common</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="Common\MDITabBar.h">\r
+ <Filter>MFCGui\Common</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="Common\PropertyPageHost.h">\r
+ <Filter>MFCGui\Common</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="Common\SplitterWndEx.h">\r
+ <Filter>MFCGui\Common</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="Common\sizecbar.h">\r
+ <Filter>MFCGui\Common</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="Common\scbarg.h">\r
+ <Filter>MFCGui\Common</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="Common\scbarcf.h">\r
+ <Filter>MFCGui\Common</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="Common\MessageBoxDialog.h">\r
+ <Filter>MFCGui\Common</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="OptionsPanel.h">\r
+ <Filter>MFCGui\Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="Common\Bitmap.h">\r
+ <Filter>MFCGui\Common</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="Common\memdc.h">\r
+ <Filter>MFCGui\Common</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="Common\ShellContextMenu.h">\r
+ <Filter>MFCGui\Common</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="Common\BCMenu.h">\r
+ <Filter>MFCGui\Common</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="Common\ColorButton.h">\r
+ <Filter>MFCGui\Common</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="Common\Picture.h">\r
+ <Filter>MFCGui\Common</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="DropHandler.h">\r
+ <Filter>MFCGui\Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="Constants.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="SourceControl.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="OptionsInit.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="TrDialogs.h">\r
+ <Filter>MFCGui\Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="MergeStatusBar.h">\r
+ <Filter>MFCGui\Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="TestMain.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.h">\r
+ <Filter>EditLib</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="PropMarkerColors.h">\r
+ <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+ </ClInclude>\r
+ </ItemGroup>\r
+ <ItemGroup>\r
+ <None Include="res\binarydiff.ico">\r
+ <Filter>Resource Files</Filter>\r
+ </None>\r
+ <None Include="res\both.bmp">\r
+ <Filter>Resource Files</Filter>\r
+ </None>\r
+ <None Include="res\equalbinary.ico">\r
+ <Filter>Resource Files</Filter>\r
+ </None>\r
+ <None Include="res\equalfile.ico">\r
+ <Filter>Resource Files</Filter>\r
+ </None>\r
+ <None Include="res\error.ico">\r
+ <Filter>Resource Files</Filter>\r
+ </None>\r
+ <None Include="res\fileskip.ico">\r
+ <Filter>Resource Files</Filter>\r
+ </None>\r
+ <None Include="res\folder.ico">\r
+ <Filter>Resource Files</Filter>\r
+ </None>\r
+ <None Include="res\folderskip.ico">\r
+ <Filter>Resource Files</Filter>\r
+ </None>\r
+ <None Include="res\folderup.ico">\r
+ <Filter>Resource Files</Filter>\r
+ </None>\r
+ <None Include="res\folderup_disable.ico">\r
+ <Filter>Resource Files</Filter>\r
+ </None>\r
+ <None Include="res\hand.cur">\r
+ <Filter>Resource Files</Filter>\r
+ </None>\r
+ <None Include="res\left.bmp">\r
+ <Filter>Resource Files</Filter>\r
+ </None>\r
+ <None Include="res\left_to_browse.bmp">\r
+ <Filter>Resource Files</Filter>\r
+ </None>\r
+ <None Include="res\left_to_right.bmp">\r
+ <Filter>Resource Files</Filter>\r
+ </None>\r
+ <None Include="res\lfile.ico">\r
+ <Filter>Resource Files</Filter>\r
+ </None>\r
+ <None Include="res\lfolder.ico">\r
+ <Filter>Resource Files</Filter>\r
+ </None>\r
+ <None Include="res\Merge.ico">\r
+ <Filter>Resource Files</Filter>\r
+ </None>\r
+ <None Include="res\Merge.rc2">\r
+ <Filter>Resource Files</Filter>\r
+ </None>\r
+ <None Include="res\MergeDir.ico">\r
+ <Filter>Resource Files</Filter>\r
+ </None>\r
+ <None Include="res\MergeDoc.ico">\r
+ <Filter>Resource Files</Filter>\r
+ </None>\r
+ <None Include="res\MergeProject.ico">\r
+ <Filter>Resource Files</Filter>\r
+ </None>\r
+ <None Include="res\mg_cur.cur">\r
+ <Filter>Resource Files</Filter>\r
+ </None>\r
+ <None Include="res\move_left_to_browse.bmp">\r
+ <Filter>Resource Files</Filter>\r
+ </None>\r
+ <None Include="res\move_right_to_browse.bmp">\r
+ <Filter>Resource Files</Filter>\r
+ </None>\r
+ <None Include="res\notequalfile.ico">\r
+ <Filter>Resource Files</Filter>\r
+ </None>\r
+ <None Include="res\rfile.ico">\r
+ <Filter>Resource Files</Filter>\r
+ </None>\r
+ <None Include="res\rfolder.ico">\r
+ <Filter>Resource Files</Filter>\r
+ </None>\r
+ <None Include="res\right.bmp">\r
+ <Filter>Resource Files</Filter>\r
+ </None>\r
+ <None Include="res\right_to_browse.bmp">\r
+ <Filter>Resource Files</Filter>\r
+ </None>\r
+ <None Include="res\right_to_left.bmp">\r
+ <Filter>Resource Files</Filter>\r
+ </None>\r
+ <None Include="res\sigma.ico">\r
+ <Filter>Resource Files</Filter>\r
+ </None>\r
+ <None Include="CHANGELO">\r
+ <Filter>ChangeLogs</Filter>\r
+ </None>\r
+ <None Include="..\Docs\Users\ChangeLog.txt">\r
+ <Filter>ChangeLogs</Filter>\r
+ </None>\r
+ <None Include="..\Externals\crystaledit\editlib\ccrystaleditview.inl">\r
+ <Filter>EditLib</Filter>\r
+ </None>\r
+ <None Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.inl">\r
+ <Filter>EditLib</Filter>\r
+ </None>\r
+ <None Include="..\Externals\crystaledit\editlib\ccrystaltextview.inl">\r
+ <Filter>EditLib</Filter>\r
+ </None>\r
+ <None Include="..\Externals\crystaledit\editlib\filesup.inl">\r
+ <Filter>EditLib</Filter>\r
+ </None>\r
+ <None Include="..\Externals\crystaledit\editlib\memcombo.inl">\r
+ <Filter>EditLib</Filter>\r
+ </None>\r
+ </ItemGroup>\r
+ <ItemGroup>\r
+ <ResourceCompile Include="Merge.rc">\r
+ <Filter>MFCGui\Source Files</Filter>\r
+ </ResourceCompile>\r
+ </ItemGroup>\r
</Project>
\ No newline at end of file
<ClCompile Include="..\Externals\crystaledit\editlib\batch.cpp" />
<ClCompile Include="..\Externals\crystaledit\editlib\ccrystaleditview.cpp" />
<ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.cpp" />
+ <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.cpp" />
<ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview.cpp" />
<ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview2.cpp" />
<ClCompile Include="..\Externals\crystaledit\editlib\ceditreplacedlg.cpp" />
<ClCompile Include="PropEditor.cpp" />
<ClCompile Include="Common\PropertyPageHost.cpp" />
<ClCompile Include="PropGeneral.cpp" />
+ <ClCompile Include="PropMarkerColors.cpp" />
<ClCompile Include="PropRegistry.cpp" />
<ClCompile Include="PropShell.cpp" />
<ClCompile Include="PropSyntaxColors.cpp" />
<ItemGroup>
<ClInclude Include="..\Externals\crystaledit\editlib\ccrystaleditview.h" />
<ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.h" />
+ <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.h" />
<ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextview.h" />
<ClInclude Include="..\Externals\crystaledit\editlib\ceditreplacedlg.h" />
<ClInclude Include="..\Externals\crystaledit\editlib\cfindtextdlg.h" />
<ClInclude Include="PropEditor.h" />
<ClInclude Include="Common\PropertyPageHost.h" />
<ClInclude Include="PropGeneral.h" />
+ <ClInclude Include="PropMarkerColors.h" />
<ClInclude Include="PropRegistry.h" />
<ClInclude Include="PropShell.h" />
<ClInclude Include="PropSyntaxColors.h" />
<ClCompile Include="..\Externals\crystaledit\editlib\rust.cpp">
<Filter>EditLib\parsers</Filter>
</ClCompile>
+ <ClCompile Include="PropMarkerColors.cpp">
+ <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="charsets.h">
</ClInclude>
<ClInclude Include="MergeStatusBar.h">
<Filter>MFCGui\Header Files</Filter>
+ <ClInclude Include="PropMarkerColors.h">
+ <Filter>MFCGui\Dialogs\PropertyPages</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
m_pView[nBuffer]->SetColorContext(theApp.GetMainSyntaxColors());
m_pDetailView[nBuffer]->SetColorContext(theApp.GetMainSyntaxColors());
+ // Currently there is only one set of markers, which all documents & views share
+ m_pView[nBuffer]->SetMarkersContext(theApp.GetMainMarkers());
+ m_pDetailView[nBuffer]->SetMarkersContext(theApp.GetMainMarkers());
+
// Set read-only statuses
m_ptBuf[nBuffer]->SetReadOnly(bRO[nBuffer]);
}
// Whether to use default (theme) text colors
extern const String OPT_CLR_DEFAULT_TEXT_COLORING OP("Settings/DefaultTextColoring");
+// Marker options
+extern const String OPT_MARKER_ENABLED OP("Settings/MarkerEnabled");
+
// Compare options
extern const String OPT_CMP_IGNORE_WHITESPACE OP("Settings/IgnoreSpace");
extern const String OPT_CMP_IGNORE_BLANKLINES OP("Settings/IgnoreBlankLines");
pOptions->InitOption(OPT_PRESERVE_FILETIMES, false);
pOptions->InitOption(OPT_TREE_MODE, true);
+ pOptions->InitOption(OPT_MARKER_ENABLED, true);
+
pOptions->InitOption(OPT_CMP_METHOD, (int)CMP_CONTENT);
pOptions->InitOption(OPT_CMP_MOVED_BLOCKS, false);
pOptions->InitOption(OPT_CMP_MATCH_SIMILAR_LINES, false);
#define IDD_ENCODINGERROR 241\r
#define IDD_PROPPAGE_COMPARE_IMAGE 242\r
#define IDD_PROPPAGE_COMPARE_BINARY 243\r
+#define IDD_PROPPAGE_COLORS_MARKER 244\r
#define IDR_LOGO 307\r
#define IDR_SPLASH 308\r
#define IDB_WINMERGE 309\r
#define IDC_PATH0_READONLY 8806\r
#define IDC_PATH1_READONLY 8807\r
#define IDC_PATH2_READONLY 8808\r
+#define IDC_MARKER_ENABLED 8809\r
+#define IDC_MARKER_COLORS_GROUP 8810\r
+#define IDC_MARKER0_COLOR_LABEL 8811\r
+#define IDC_MARKER1_COLOR_LABEL 8812\r
+#define IDC_MARKER2_COLOR_LABEL 8813\r
+#define IDC_MARKER3_COLOR_LABEL 8814\r
+#define IDC_MARKER0_BKGD_COLOR 8815\r
+#define IDC_MARKER1_BKGD_COLOR 8816\r
+#define IDC_MARKER2_BKGD_COLOR 8817\r
+#define IDC_MARKER3_BKGD_COLOR 8818\r
#define IDS_SPLASH_DEVELOPERS 8976\r
#define IDS_SPLASH_GPLTEXT 8977\r
#define IDS_MESSAGEBOX_OK 9001\r
#define IDS_OPTIONSPG_COLORS 9044\r
#define IDS_OPTIONSPG_TEXTCOLORS 9045\r
#define IDS_OPTIONSPG_SYNTAXCOLORS 9046\r
-#define IDS_OPTIONSPG_SYSTEM 9047\r
-#define IDS_OPTIONSPG_VERSIONCONTROL 9048\r
-#define IDS_OPTIONSPG_CODEPAGE 9049\r
-#define IDS_OPTIONSPG_ARCHIVE 9050\r
-#define IDS_OPTIONSPG_BACKUPS 9051\r
-#define IDS_OPTIONSPG_SHELL 9052\r
-#define IDS_OPTIONSPG_MERGECOLORS 9053\r
-#define IDS_OPTIONSPG_GENCOMPARE 9054\r
-#define IDS_OPTIONSPG_FOLDERCOMPARE 9055\r
-#define IDS_OPTIONSPG_IMAGECOMPARE 9056\r
-#define IDS_OPTIONSPG_BINARYCOMPARE 9057\r
+#define IDS_OPTIONSPG_MARKERCOLORS 9047\r
+#define IDS_OPTIONSPG_SYSTEM 9048\r
+#define IDS_OPTIONSPG_VERSIONCONTROL 9049\r
+#define IDS_OPTIONSPG_CODEPAGE 9050\r
+#define IDS_OPTIONSPG_ARCHIVE 9051\r
+#define IDS_OPTIONSPG_BACKUPS 9052\r
+#define IDS_OPTIONSPG_SHELL 9053\r
+#define IDS_OPTIONSPG_MERGECOLORS 9054\r
+#define IDS_OPTIONSPG_GENCOMPARE 9055\r
+#define IDS_OPTIONSPG_FOLDERCOMPARE 9056\r
+#define IDS_OPTIONSPG_IMAGECOMPARE 9057\r
+#define IDS_OPTIONSPG_BINARYCOMPARE 9058\r
#define IDS_TO 16000\r
#define IDS_FROM_LEFT 16001\r
#define IDS_TO_LEFT 16002\r
#ifdef APSTUDIO_INVOKED\r
#ifndef APSTUDIO_READONLY_SYMBOLS\r
#define _APS_3D_CONTROLS 1\r
-#define _APS_NEXT_RESOURCE_VALUE 246\r
+#define _APS_NEXT_RESOURCE_VALUE 247\r
#define _APS_NEXT_COMMAND_VALUE 33545\r
-#define _APS_NEXT_CONTROL_VALUE 8809\r
+#define _APS_NEXT_CONTROL_VALUE 8817\r
#define _APS_NEXT_SYMED_VALUE 115\r
#endif\r
#endif\r
msgid "Bold"
msgstr "Lodia"
+#: Merge.rc:5A9A713E
+#, c-format
+msgid "&Enable marker"
+msgstr ""
+
+#: Merge.rc:2CEE4749
+#, c-format
+msgid "Marker colors"
+msgstr ""
+
+#: Merge.rc:56BD1FBA
+#, c-format
+msgid "Search Marker:"
+msgstr ""
+
+#: Merge.rc:7B76381B
+#, c-format
+msgid "User Defined Marker1:"
+msgstr ""
+
+#: Merge.rc:7B76381C
+#, c-format
+msgid "User Defined Marker2:"
+msgstr ""
+
+#: Merge.rc:7B76381D
+#, c-format
+msgid "User Defined Marker3:"
+msgstr ""
+
#: Merge.rc:387F7980
#, c-format
msgid "Folder Compare Report"
msgid "Middle:"
msgstr ""
-#: Merge.rc:2CEE4749
+#: Merge.rc:2CEE474A
#, c-format
msgid "Missing Left:"
msgstr ""
msgid "Select Codepage for"
msgstr "Hautatu Kode-orrialdea"
-#: Merge.rc:5A9A713E
+#: Merge.rc:5A9A713F
#, c-format
msgid "&File Loading:"
msgstr "&Agiria Gertatzen:"
msgid "Syntax"
msgstr "Joskera"
+#: Merge.rc:2FC0BA7D
+#, c-format
+msgid "Markers"
+msgstr ""
+
#: Merge.rc:2C1D73C8
#, c-format
msgid "Version Control"
msgid "Bold"
msgstr "Negrito"
+#: Merge.rc:5A9A713E
+#, c-format
+msgid "&Enable marker"
+msgstr ""
+
+#: Merge.rc:2CEE4749
+#, c-format
+msgid "Marker colors"
+msgstr ""
+
+#: Merge.rc:56BD1FBA
+#, c-format
+msgid "Search Marker:"
+msgstr ""
+
+#: Merge.rc:7B76381B
+#, c-format
+msgid "User Defined Marker1:"
+msgstr ""
+
+#: Merge.rc:7B76381C
+#, c-format
+msgid "User Defined Marker2:"
+msgstr ""
+
+#: Merge.rc:7B76381D
+#, c-format
+msgid "User Defined Marker3:"
+msgstr ""
+
#: Merge.rc:387F7980
#, c-format
msgid "Folder Compare Report"
msgid "Middle:"
msgstr ""
-#: Merge.rc:2CEE4749
+#: Merge.rc:2CEE474A
#, c-format
msgid "Missing Left:"
msgstr ""
msgid "Select Codepage for"
msgstr "Selecionar o Código da Página para"
-#: Merge.rc:5A9A713E
+#: Merge.rc:5A9A713F
#, c-format
msgid "&File Loading:"
msgstr "&Carregamento do Arquivo:"
msgid "Syntax"
msgstr ""
+#: Merge.rc:2FC0BA7D
+#, c-format
+msgid "Markers"
+msgstr ""
+
#: Merge.rc:2C1D73C8
#, c-format
msgid "Version Control"
msgid "Bold"
msgstr "Óäåáåëåí"
+#: Merge.rc:5A9A713E
+#, c-format
+msgid "&Enable marker"
+msgstr ""
+
+#: Merge.rc:2CEE4749
+#, c-format
+msgid "Marker colors"
+msgstr ""
+
+#: Merge.rc:56BD1FBA
+#, c-format
+msgid "Search Marker:"
+msgstr ""
+
+#: Merge.rc:7B76381B
+#, c-format
+msgid "User Defined Marker1:"
+msgstr ""
+
+#: Merge.rc:7B76381C
+#, c-format
+msgid "User Defined Marker2:"
+msgstr ""
+
+#: Merge.rc:7B76381D
+#, c-format
+msgid "User Defined Marker3:"
+msgstr ""
+
#: Merge.rc:387F7980
#, c-format
msgid "Folder Compare Report"
msgid "Middle:"
msgstr ""
-#: Merge.rc:2CEE4749
+#: Merge.rc:2CEE474A
#, c-format
msgid "Missing Left:"
msgstr ""
msgid "Select Codepage for"
msgstr "Èçáåðåòå êîäèðîâêà çà"
-#: Merge.rc:5A9A713E
+#: Merge.rc:5A9A713F
#, c-format
msgid "&File Loading:"
msgstr "&Çàðåæäàíå íà ôàéë:"
msgid "Syntax"
msgstr ""
+#: Merge.rc:2FC0BA7D
+#, c-format
+msgid "Markers"
+msgstr ""
+
#: Merge.rc:2C1D73C8
#, c-format
msgid "Version Control"
msgid "Bold"
msgstr "Negreta"
+#: Merge.rc:5A9A713E
+#, c-format
+msgid "&Enable marker"
+msgstr ""
+
+#: Merge.rc:2CEE4749
+#, c-format
+msgid "Marker colors"
+msgstr ""
+
+#: Merge.rc:56BD1FBA
+#, c-format
+msgid "Search Marker:"
+msgstr ""
+
+#: Merge.rc:7B76381B
+#, c-format
+msgid "User Defined Marker1:"
+msgstr ""
+
+#: Merge.rc:7B76381C
+#, c-format
+msgid "User Defined Marker2:"
+msgstr ""
+
+#: Merge.rc:7B76381D
+#, c-format
+msgid "User Defined Marker3:"
+msgstr ""
+
#: Merge.rc:387F7980
#, c-format
msgid "Folder Compare Report"
msgid "Middle:"
msgstr ""
-#: Merge.rc:2CEE4749
+#: Merge.rc:2CEE474A
#, c-format
msgid "Missing Left:"
msgstr ""
msgid "Select Codepage for"
msgstr "Selecciona pàgina de codis per a"
-#: Merge.rc:5A9A713E
+#: Merge.rc:5A9A713F
#, c-format
msgid "&File Loading:"
msgstr "&Càrrega de fitxers:"
msgid "Syntax"
msgstr ""
+#: Merge.rc:2FC0BA7D
+#, c-format
+msgid "Markers"
+msgstr ""
+
#: Merge.rc:2C1D73C8
#, c-format
msgid "Version Control"
msgid "Bold"
msgstr "¼Ó´Ö"
+#: Merge.rc:5A9A713E
+#, c-format
+msgid "&Enable marker"
+msgstr ""
+
+#: Merge.rc:2CEE4749
+#, c-format
+msgid "Marker colors"
+msgstr ""
+
+#: Merge.rc:56BD1FBA
+#, c-format
+msgid "Search Marker:"
+msgstr ""
+
+#: Merge.rc:7B76381B
+#, c-format
+msgid "User Defined Marker1:"
+msgstr ""
+
+#: Merge.rc:7B76381C
+#, c-format
+msgid "User Defined Marker2:"
+msgstr ""
+
+#: Merge.rc:7B76381D
+#, c-format
+msgid "User Defined Marker3:"
+msgstr ""
+
#: Merge.rc:387F7980
#, c-format
msgid "Folder Compare Report"
msgid "Middle:"
msgstr ""
-#: Merge.rc:2CEE4749
+#: Merge.rc:2CEE474A
#, c-format
msgid "Missing Left:"
msgstr ""
msgid "Select Codepage for"
msgstr "Ñ¡ÔñҪʹÓõĴúÂëÒ³"
-#: Merge.rc:5A9A713E
+#: Merge.rc:5A9A713F
#, c-format
msgid "&File Loading:"
msgstr "´ò¿ªÎļþ(&F):"
msgid "Syntax"
msgstr ""
+#: Merge.rc:2FC0BA7D
+#, c-format
+msgid "Markers"
+msgstr ""
+
#: Merge.rc:2C1D73C8
#, c-format
msgid "Version Control"
msgid "Bold"
msgstr "²ÊÅé"
+#: Merge.rc:5A9A713E
+#, c-format
+msgid "&Enable marker"
+msgstr ""
+
+#: Merge.rc:2CEE4749
+#, c-format
+msgid "Marker colors"
+msgstr ""
+
+#: Merge.rc:56BD1FBA
+#, c-format
+msgid "Search Marker:"
+msgstr ""
+
+#: Merge.rc:7B76381B
+#, c-format
+msgid "User Defined Marker1:"
+msgstr ""
+
+#: Merge.rc:7B76381C
+#, c-format
+msgid "User Defined Marker2:"
+msgstr ""
+
+#: Merge.rc:7B76381D
+#, c-format
+msgid "User Defined Marker3:"
+msgstr ""
+
#: Merge.rc:387F7980
#, c-format
msgid "Folder Compare Report"
msgid "Middle:"
msgstr "¤¤¶¡¡G"
-#: Merge.rc:2CEE4749
+#: Merge.rc:2CEE474A
#, c-format
msgid "Missing Left:"
msgstr "¿ò¥¢¥ªÃä¡G"
msgid "Select Codepage for"
msgstr "¿ï©w½s½X¶µ¹"
-#: Merge.rc:5A9A713E
+#: Merge.rc:5A9A713F
#, c-format
msgid "&File Loading:"
msgstr "n¸ü¤JªºÀÉ®×(&F)¡G"
msgid "Syntax"
msgstr "»yªk"
+#: Merge.rc:2FC0BA7D
+#, c-format
+msgid "Markers"
+msgstr ""
+
#: Merge.rc:2C1D73C8
#, c-format
msgid "Version Control"
msgid "Bold"
msgstr "Podebljano"
+#: Merge.rc:5A9A713E
+#, c-format
+msgid "&Enable marker"
+msgstr ""
+
+#: Merge.rc:2CEE4749
+#, c-format
+msgid "Marker colors"
+msgstr ""
+
+#: Merge.rc:56BD1FBA
+#, c-format
+msgid "Search Marker:"
+msgstr ""
+
+#: Merge.rc:7B76381B
+#, c-format
+msgid "User Defined Marker1:"
+msgstr ""
+
+#: Merge.rc:7B76381C
+#, c-format
+msgid "User Defined Marker2:"
+msgstr ""
+
+#: Merge.rc:7B76381D
+#, c-format
+msgid "User Defined Marker3:"
+msgstr ""
+
#: Merge.rc:387F7980
#, c-format
msgid "Folder Compare Report"
msgid "Middle:"
msgstr ""
-#: Merge.rc:2CEE4749
+#: Merge.rc:2CEE474A
#, c-format
msgid "Missing Left:"
msgstr ""
msgid "Select Codepage for"
msgstr "Odabir kodne stranice za"
-#: Merge.rc:5A9A713E
+#: Merge.rc:5A9A713F
#, c-format
msgid "&File Loading:"
msgstr "&Uèitavanje datoteke:"
msgid "Syntax"
msgstr ""
+#: Merge.rc:2FC0BA7D
+#, c-format
+msgid "Markers"
+msgstr ""
+
#: Merge.rc:2C1D73C8
#, c-format
msgid "Version Control"
msgid "Bold"
msgstr "Tuèné"
+#: Merge.rc:5A9A713E
+#, c-format
+msgid "&Enable marker"
+msgstr ""
+
+#: Merge.rc:2CEE4749
+#, c-format
+msgid "Marker colors"
+msgstr ""
+
+#: Merge.rc:56BD1FBA
+#, c-format
+msgid "Search Marker:"
+msgstr ""
+
+#: Merge.rc:7B76381B
+#, c-format
+msgid "User Defined Marker1:"
+msgstr ""
+
+#: Merge.rc:7B76381C
+#, c-format
+msgid "User Defined Marker2:"
+msgstr ""
+
+#: Merge.rc:7B76381D
+#, c-format
+msgid "User Defined Marker3:"
+msgstr ""
+
#: Merge.rc:387F7980
#, c-format
msgid "Folder Compare Report"
msgid "Middle:"
msgstr ""
-#: Merge.rc:2CEE4749
+#: Merge.rc:2CEE474A
#, c-format
msgid "Missing Left:"
msgstr ""
msgid "Select Codepage for"
msgstr "Zvolte kódování pro"
-#: Merge.rc:5A9A713E
+#: Merge.rc:5A9A713F
#, c-format
msgid "&File Loading:"
msgstr "&Naètení souboru:"
msgid "Syntax"
msgstr "Syntaxe"
+#: Merge.rc:2FC0BA7D
+#, c-format
+msgid "Markers"
+msgstr ""
+
#: Merge.rc:2C1D73C8
#, c-format
msgid "Version Control"
msgid "Bold"
msgstr "Fed"
+#: Merge.rc:5A9A713E
+#, c-format
+msgid "&Enable marker"
+msgstr ""
+
+#: Merge.rc:2CEE4749
+#, c-format
+msgid "Marker colors"
+msgstr ""
+
+#: Merge.rc:56BD1FBA
+#, c-format
+msgid "Search Marker:"
+msgstr ""
+
+#: Merge.rc:7B76381B
+#, c-format
+msgid "User Defined Marker1:"
+msgstr ""
+
+#: Merge.rc:7B76381C
+#, c-format
+msgid "User Defined Marker2:"
+msgstr ""
+
+#: Merge.rc:7B76381D
+#, c-format
+msgid "User Defined Marker3:"
+msgstr ""
+
#: Merge.rc:387F7980
#, c-format
msgid "Folder Compare Report"
msgid "Middle:"
msgstr ""
-#: Merge.rc:2CEE4749
+#: Merge.rc:2CEE474A
#, c-format
msgid "Missing Left:"
msgstr ""
msgid "Select Codepage for"
msgstr "Vælg codepage til"
-#: Merge.rc:5A9A713E
+#: Merge.rc:5A9A713F
#, c-format
msgid "&File Loading:"
msgstr "&Fil Indlæsning:"
msgid "Syntax"
msgstr "Syntaks"
+#: Merge.rc:2FC0BA7D
+#, c-format
+msgid "Markers"
+msgstr ""
+
#: Merge.rc:2C1D73C8
#, c-format
msgid "Version Control"
msgid "Bold"
msgstr "Vet"
+#: Merge.rc:5A9A713E
+#, c-format
+msgid "&Enable marker"
+msgstr ""
+
+#: Merge.rc:2CEE4749
+#, c-format
+msgid "Marker colors"
+msgstr ""
+
+#: Merge.rc:56BD1FBA
+#, c-format
+msgid "Search Marker:"
+msgstr ""
+
+#: Merge.rc:7B76381B
+#, c-format
+msgid "User Defined Marker1:"
+msgstr ""
+
+#: Merge.rc:7B76381C
+#, c-format
+msgid "User Defined Marker2:"
+msgstr ""
+
+#: Merge.rc:7B76381D
+#, c-format
+msgid "User Defined Marker3:"
+msgstr ""
+
#: Merge.rc:387F7980
#, c-format
msgid "Folder Compare Report"
msgid "Middle:"
msgstr ""
-#: Merge.rc:2CEE4749
+#: Merge.rc:2CEE474A
#, c-format
msgid "Missing Left:"
msgstr ""
msgid "Select Codepage for"
msgstr "Selecteer codetabel voor"
-#: Merge.rc:5A9A713E
+#: Merge.rc:5A9A713F
#, c-format
msgid "&File Loading:"
msgstr "Bestanden laden:"
msgid "Syntax"
msgstr "Syntax"
+#: Merge.rc:2FC0BA7D
+#, c-format
+msgid "Markers"
+msgstr ""
+
#: Merge.rc:2C1D73C8
#, c-format
msgid "Version Control"
msgstr ""
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2017-03-26 14:36+0000\n"
+"POT-Creation-Date: 2017-08-29 01:00+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"
msgid "Bold"
msgstr ""
+#: Merge.rc:5A9A713E
+#, c-format
+msgid "&Enable marker"
+msgstr ""
+
+#: Merge.rc:2CEE4749
+#, c-format
+msgid "Marker colors"
+msgstr ""
+
+#: Merge.rc:56BD1FBA
+#, c-format
+msgid "Search Marker:"
+msgstr ""
+
+#: Merge.rc:7B76381B
+#, c-format
+msgid "User Defined Marker1:"
+msgstr ""
+
+#: Merge.rc:7B76381C
+#, c-format
+msgid "User Defined Marker2:"
+msgstr ""
+
+#: Merge.rc:7B76381D
+#, c-format
+msgid "User Defined Marker3:"
+msgstr ""
+
#: Merge.rc:387F7980
#, c-format
msgid "Folder Compare Report"
msgid "Middle:"
msgstr ""
-#: Merge.rc:2CEE4749
+#: Merge.rc:2CEE474A
#, c-format
msgid "Missing Left:"
msgstr ""
msgid "Select Codepage for"
msgstr ""
-#: Merge.rc:5A9A713E
+#: Merge.rc:5A9A713F
#, c-format
msgid "&File Loading:"
msgstr ""
msgid "Syntax"
msgstr ""
+#: Merge.rc:2FC0BA7D
+#, c-format
+msgid "Markers"
+msgstr ""
+
#: Merge.rc:2C1D73C8
#, c-format
msgid "Version Control"
msgid "Bold"
msgstr "Surbrillance"
+#: Merge.rc:5A9A713E
+#, c-format
+msgid "&Enable marker"
+msgstr ""
+
+#: Merge.rc:2CEE4749
+#, c-format
+msgid "Marker colors"
+msgstr ""
+
+#: Merge.rc:56BD1FBA
+#, c-format
+msgid "Search Marker:"
+msgstr ""
+
+#: Merge.rc:7B76381B
+#, c-format
+msgid "User Defined Marker1:"
+msgstr ""
+
+#: Merge.rc:7B76381C
+#, c-format
+msgid "User Defined Marker2:"
+msgstr ""
+
+#: Merge.rc:7B76381D
+#, c-format
+msgid "User Defined Marker3:"
+msgstr ""
+
#: Merge.rc:387F7980
#, c-format
msgid "Folder Compare Report"
msgid "Middle:"
msgstr ""
-#: Merge.rc:2CEE4749
+#: Merge.rc:2CEE474A
#, c-format
msgid "Missing Left:"
msgstr ""
msgid "Select Codepage for"
msgstr "Sélectionner le code de page pour"
-#: Merge.rc:5A9A713E
+#: Merge.rc:5A9A713F
#, c-format
msgid "&File Loading:"
msgstr "&Chargement de fichier:"
msgid "Syntax"
msgstr "Syntaxe"
+#: Merge.rc:2FC0BA7D
+#, c-format
+msgid "Markers"
+msgstr ""
+
#: Merge.rc:2C1D73C8
#, c-format
msgid "Version Control"
msgid "Bold"
msgstr "Negra"
+#: Merge.rc:5A9A713E
+#, c-format
+msgid "&Enable marker"
+msgstr ""
+
+#: Merge.rc:2CEE4749
+#, c-format
+msgid "Marker colors"
+msgstr ""
+
+#: Merge.rc:56BD1FBA
+#, c-format
+msgid "Search Marker:"
+msgstr ""
+
+#: Merge.rc:7B76381B
+#, c-format
+msgid "User Defined Marker1:"
+msgstr ""
+
+#: Merge.rc:7B76381C
+#, c-format
+msgid "User Defined Marker2:"
+msgstr ""
+
+#: Merge.rc:7B76381D
+#, c-format
+msgid "User Defined Marker3:"
+msgstr ""
+
#: Merge.rc:387F7980
#, c-format
msgid "Folder Compare Report"
msgid "Middle:"
msgstr ""
-#: Merge.rc:2CEE4749
+#: Merge.rc:2CEE474A
#, c-format
msgid "Missing Left:"
msgstr ""
msgid "Select Codepage for"
msgstr "Selecciona a páxina de códigos para"
-#: Merge.rc:5A9A713E
+#: Merge.rc:5A9A713F
#, c-format
msgid "&File Loading:"
msgstr "&Cargar o arquivo:"
msgid "Syntax"
msgstr ""
+#: Merge.rc:2FC0BA7D
+#, c-format
+msgid "Markers"
+msgstr ""
+
#: Merge.rc:2C1D73C8
#, c-format
msgid "Version Control"
msgid "Bold"
msgstr "Fett"
+#: Merge.rc:5A9A713E
+#, c-format
+msgid "&Enable marker"
+msgstr ""
+
+#: Merge.rc:2CEE4749
+#, c-format
+msgid "Marker colors"
+msgstr ""
+
+#: Merge.rc:56BD1FBA
+#, c-format
+msgid "Search Marker:"
+msgstr ""
+
+#: Merge.rc:7B76381B
+#, c-format
+msgid "User Defined Marker1:"
+msgstr ""
+
+#: Merge.rc:7B76381C
+#, c-format
+msgid "User Defined Marker2:"
+msgstr ""
+
+#: Merge.rc:7B76381D
+#, c-format
+msgid "User Defined Marker3:"
+msgstr ""
+
#: Merge.rc:387F7980
#, c-format
msgid "Folder Compare Report"
msgid "Middle:"
msgstr ""
-#: Merge.rc:2CEE4749
+#: Merge.rc:2CEE474A
#, c-format
msgid "Missing Left:"
msgstr ""
msgid "Select Codepage for"
msgstr "Zeichensatz auswählen für"
-#: Merge.rc:5A9A713E
+#: Merge.rc:5A9A713F
#, c-format
msgid "&File Loading:"
msgstr "&Datei laden:"
msgid "Syntax"
msgstr "Syntax"
+#: Merge.rc:2FC0BA7D
+#, c-format
+msgid "Markers"
+msgstr ""
+
#: Merge.rc:2C1D73C8
#, c-format
msgid "Version Control"
msgid "Bold"
msgstr "¸íôïíá"
+#: Merge.rc:5A9A713E
+#, c-format
+msgid "&Enable marker"
+msgstr ""
+
+#: Merge.rc:2CEE4749
+#, c-format
+msgid "Marker colors"
+msgstr ""
+
+#: Merge.rc:56BD1FBA
+#, c-format
+msgid "Search Marker:"
+msgstr ""
+
+#: Merge.rc:7B76381B
+#, c-format
+msgid "User Defined Marker1:"
+msgstr ""
+
+#: Merge.rc:7B76381C
+#, c-format
+msgid "User Defined Marker2:"
+msgstr ""
+
+#: Merge.rc:7B76381D
+#, c-format
+msgid "User Defined Marker3:"
+msgstr ""
+
#: Merge.rc:387F7980
#, c-format
msgid "Folder Compare Report"
msgid "Middle:"
msgstr ""
-#: Merge.rc:2CEE4749
+#: Merge.rc:2CEE474A
#, c-format
msgid "Missing Left:"
msgstr ""
msgid "Select Codepage for"
msgstr "ÅðéëïãÞ Êùäéêïóåëßäáò ãéá"
-#: Merge.rc:5A9A713E
+#: Merge.rc:5A9A713F
#, c-format
msgid "&File Loading:"
msgstr "ÁíÜ&ãíùóç Áñ÷åßïõ:"
msgid "Syntax"
msgstr ""
+#: Merge.rc:2FC0BA7D
+#, c-format
+msgid "Markers"
+msgstr ""
+
#: Merge.rc:2C1D73C8
#, c-format
msgid "Version Control"
msgid "Bold"
msgstr "Félkövér"
+#: Merge.rc:5A9A713E
+#, c-format
+msgid "&Enable marker"
+msgstr ""
+
+#: Merge.rc:2CEE4749
+#, c-format
+msgid "Marker colors"
+msgstr ""
+
+#: Merge.rc:56BD1FBA
+#, c-format
+msgid "Search Marker:"
+msgstr ""
+
+#: Merge.rc:7B76381B
+#, c-format
+msgid "User Defined Marker1:"
+msgstr ""
+
+#: Merge.rc:7B76381C
+#, c-format
+msgid "User Defined Marker2:"
+msgstr ""
+
+#: Merge.rc:7B76381D
+#, c-format
+msgid "User Defined Marker3:"
+msgstr ""
+
#: Merge.rc:387F7980
#, c-format
msgid "Folder Compare Report"
msgid "Middle:"
msgstr ""
-#: Merge.rc:2CEE4749
+#: Merge.rc:2CEE474A
#, c-format
msgid "Missing Left:"
msgstr ""
msgid "Select Codepage for"
msgstr "Kódlap kiválasztása"
-#: Merge.rc:5A9A713E
+#: Merge.rc:5A9A713F
#, c-format
msgid "&File Loading:"
msgstr "Fájl töltése:"
msgid "Syntax"
msgstr ""
+#: Merge.rc:2FC0BA7D
+#, c-format
+msgid "Markers"
+msgstr ""
+
#: Merge.rc:2C1D73C8
#, c-format
msgid "Version Control"
msgid "Bold"
msgstr "Grassetto"
+#: Merge.rc:5A9A713E
+#, c-format
+msgid "&Enable marker"
+msgstr ""
+
+#: Merge.rc:2CEE4749
+#, c-format
+msgid "Marker colors"
+msgstr ""
+
+#: Merge.rc:56BD1FBA
+#, c-format
+msgid "Search Marker:"
+msgstr ""
+
+#: Merge.rc:7B76381B
+#, c-format
+msgid "User Defined Marker1:"
+msgstr ""
+
+#: Merge.rc:7B76381C
+#, c-format
+msgid "User Defined Marker2:"
+msgstr ""
+
+#: Merge.rc:7B76381D
+#, c-format
+msgid "User Defined Marker3:"
+msgstr ""
+
#: Merge.rc:387F7980
#, c-format
msgid "Folder Compare Report"
msgid "Middle:"
msgstr ""
-#: Merge.rc:2CEE4749
+#: Merge.rc:2CEE474A
#, c-format
msgid "Missing Left:"
msgstr ""
msgid "Select Codepage for"
msgstr "Scegli codice di pagina per"
-#: Merge.rc:5A9A713E
+#: Merge.rc:5A9A713F
#, c-format
msgid "&File Loading:"
msgstr "Caricamento &file:"
msgid "Syntax"
msgstr ""
+#: Merge.rc:2FC0BA7D
+#, c-format
+msgid "Markers"
+msgstr ""
+
#: Merge.rc:2C1D73C8
#, c-format
msgid "Version Control"
msgid "Bold"
msgstr "\91¾\8e\9a"
+#: Merge.rc:5A9A713E
+#, c-format
+msgid "\83}\81[\83J\81[\82ð\97L\8cø\82É\82·\82é(&E)"
+msgstr ""
+
+#: Merge.rc:2CEE4749
+#, c-format
+msgid "Marker colors"
+msgstr "\83}\81[\83J\81[\82Ì\90F"
+
+#: Merge.rc:56BD1FBA
+#, c-format
+msgid "Search Marker:"
+msgstr "\8c\9f\8dõ\83}\81[\83J\81["
+
+#: Merge.rc:7B76381B
+#, c-format
+msgid "User Defined Marker1:"
+msgstr "\83\86\81[\83U\81[\92è\8b`\83}\81[\83J\81[1:"
+
+#: Merge.rc:7B76381C
+#, c-format
+msgid "User Defined Marker2:"
+msgstr "\83\86\81[\83U\81[\92è\8b`\83}\81[\83J\81[1:"
+
+#: Merge.rc:7B76381D
+#, c-format
+msgid "User Defined Marker3:"
+msgstr "\83\86\81[\83U\81[\92è\8b`\83}\81[\83J\81[1:"
+
#: Merge.rc:387F7980
#, c-format
msgid "Folder Compare Report"
msgid "Middle:"
msgstr "\92\86\89\9b:"
-#: Merge.rc:2CEE4749
+#: Merge.rc:2CEE474A
#, c-format
msgid "Missing Left:"
msgstr "\8d¶\91¤\82Ì\82Ý\96³\82µ:"
msgid "Select Codepage for"
msgstr "\83R\81[\83h\83y\81[\83W\82Ì\91I\91ð"
-#: Merge.rc:5A9A713E
+#: Merge.rc:5A9A713F
#, c-format
msgid "&File Loading:"
msgstr "\83t\83@\83C\83\8b\93Ç\8d\9e\82Ý(&F):"
msgid "Syntax"
msgstr "\83V\83\93\83^\83b\83N\83X"
+#: Merge.rc:2FC0BA7D
+#, c-format
+msgid "Markers"
+msgstr "\83}\81[\83J\81["
+
#: Merge.rc:2C1D73C8
#, c-format
msgid "Version Control"
msgid "Bold"
msgstr "±½°Ô"
+#: Merge.rc:5A9A713E
+#, c-format
+msgid "&Enable marker"
+msgstr ""
+
+#: Merge.rc:2CEE4749
+#, c-format
+msgid "Marker colors"
+msgstr ""
+
+#: Merge.rc:56BD1FBA
+#, c-format
+msgid "Search Marker:"
+msgstr ""
+
+#: Merge.rc:7B76381B
+#, c-format
+msgid "User Defined Marker1:"
+msgstr ""
+
+#: Merge.rc:7B76381C
+#, c-format
+msgid "User Defined Marker2:"
+msgstr ""
+
+#: Merge.rc:7B76381D
+#, c-format
+msgid "User Defined Marker3:"
+msgstr ""
+
#: Merge.rc:387F7980
#, c-format
msgid "Folder Compare Report"
msgid "Middle:"
msgstr "°¡¿îµ¥:"
-#: Merge.rc:2CEE4749
+#: Merge.rc:2CEE474A
#, c-format
msgid "Missing Left:"
msgstr "¿ÞÂÊ ¾øÀ½:"
msgid "Select Codepage for"
msgstr "ÄÚµåÆäÀÌÁö ¼±ÅÃ"
-#: Merge.rc:5A9A713E
+#: Merge.rc:5A9A713F
#, c-format
msgid "&File Loading:"
msgstr "ÆÄÀÏ ºÒ·¯¿À±â(&F):"
msgid "Syntax"
msgstr "±¸¹®"
+#: Merge.rc:2FC0BA7D
+#, c-format
+msgid "Markers"
+msgstr ""
+
#: Merge.rc:2C1D73C8
#, c-format
msgid "Version Control"
msgid "Bold"
msgstr "Fet"
+#: Merge.rc:5A9A713E
+#, c-format
+msgid "&Enable marker"
+msgstr ""
+
+#: Merge.rc:2CEE4749
+#, c-format
+msgid "Marker colors"
+msgstr ""
+
+#: Merge.rc:56BD1FBA
+#, c-format
+msgid "Search Marker:"
+msgstr ""
+
+#: Merge.rc:7B76381B
+#, c-format
+msgid "User Defined Marker1:"
+msgstr ""
+
+#: Merge.rc:7B76381C
+#, c-format
+msgid "User Defined Marker2:"
+msgstr ""
+
+#: Merge.rc:7B76381D
+#, c-format
+msgid "User Defined Marker3:"
+msgstr ""
+
#: Merge.rc:387F7980
#, c-format
msgid "Folder Compare Report"
msgid "Middle:"
msgstr ""
-#: Merge.rc:2CEE4749
+#: Merge.rc:2CEE474A
#, c-format
msgid "Missing Left:"
msgstr ""
msgid "Select Codepage for"
msgstr "Velg tegnsett til"
-#: Merge.rc:5A9A713E
+#: Merge.rc:5A9A713F
#, c-format
msgid "&File Loading:"
msgstr "&Fil-lasting:"
msgid "Syntax"
msgstr ""
+#: Merge.rc:2FC0BA7D
+#, c-format
+msgid "Markers"
+msgstr ""
+
#: Merge.rc:2C1D73C8
#, c-format
msgid "Version Control"
msgid "Bold"
msgstr " ÊíÑå "
+#: Merge.rc:5A9A713E
+#, c-format
+msgid "&Enable marker"
+msgstr ""
+
+#: Merge.rc:2CEE4749
+#, c-format
+msgid "Marker colors"
+msgstr ""
+
+#: Merge.rc:56BD1FBA
+#, c-format
+msgid "Search Marker:"
+msgstr ""
+
+#: Merge.rc:7B76381B
+#, c-format
+msgid "User Defined Marker1:"
+msgstr ""
+
+#: Merge.rc:7B76381C
+#, c-format
+msgid "User Defined Marker2:"
+msgstr ""
+
+#: Merge.rc:7B76381D
+#, c-format
+msgid "User Defined Marker3:"
+msgstr ""
+
#: Merge.rc:387F7980
#, c-format
msgid "Folder Compare Report"
msgid "Middle:"
msgstr ""
-#: Merge.rc:2CEE4749
+#: Merge.rc:2CEE474A
#, c-format
msgid "Missing Left:"
msgstr ""
msgid "Select Codepage for"
msgstr " ÇäÊÎÇÈ ÕÝÍå \98Ï ÈÑÇí "
-#: Merge.rc:5A9A713E
+#: Merge.rc:5A9A713F
#, c-format
msgid "&File Loading:"
msgstr "&F ÈÇÑ\90ÐÇÑí \81ÑæäÏå : "
msgid "Syntax"
msgstr ""
+#: Merge.rc:2FC0BA7D
+#, c-format
+msgid "Markers"
+msgstr ""
+
#: Merge.rc:2C1D73C8
#, c-format
msgid "Version Control"
msgid "Bold"
msgstr "Pogrubienie"
+#: Merge.rc:5A9A713E
+#, c-format
+msgid "&Enable marker"
+msgstr ""
+
+#: Merge.rc:2CEE4749
+#, c-format
+msgid "Marker colors"
+msgstr ""
+
+#: Merge.rc:56BD1FBA
+#, c-format
+msgid "Search Marker:"
+msgstr ""
+
+#: Merge.rc:7B76381B
+#, c-format
+msgid "User Defined Marker1:"
+msgstr ""
+
+#: Merge.rc:7B76381C
+#, c-format
+msgid "User Defined Marker2:"
+msgstr ""
+
+#: Merge.rc:7B76381D
+#, c-format
+msgid "User Defined Marker3:"
+msgstr ""
+
#: Merge.rc:387F7980
#, c-format
msgid "Folder Compare Report"
msgid "Middle:"
msgstr ""
-#: Merge.rc:2CEE4749
+#: Merge.rc:2CEE474A
#, c-format
msgid "Missing Left:"
msgstr ""
msgid "Select Codepage for"
msgstr "Wybierz stronê kodow¹ dla"
-#: Merge.rc:5A9A713E
+#: Merge.rc:5A9A713F
#, c-format
msgid "&File Loading:"
msgstr "&£adowanie pliku:"
msgid "Syntax"
msgstr "Sk³adnia"
+#: Merge.rc:2FC0BA7D
+#, c-format
+msgid "Markers"
+msgstr ""
+
#: Merge.rc:2C1D73C8
#, c-format
msgid "Version Control"
msgid "Bold"
msgstr "Negrito"
+#: Merge.rc:5A9A713E
+#, c-format
+msgid "&Enable marker"
+msgstr ""
+
+#: Merge.rc:2CEE4749
+#, c-format
+msgid "Marker colors"
+msgstr ""
+
+#: Merge.rc:56BD1FBA
+#, c-format
+msgid "Search Marker:"
+msgstr ""
+
+#: Merge.rc:7B76381B
+#, c-format
+msgid "User Defined Marker1:"
+msgstr ""
+
+#: Merge.rc:7B76381C
+#, c-format
+msgid "User Defined Marker2:"
+msgstr ""
+
+#: Merge.rc:7B76381D
+#, c-format
+msgid "User Defined Marker3:"
+msgstr ""
+
#: Merge.rc:387F7980
#, c-format
msgid "Folder Compare Report"
msgid "Middle:"
msgstr "Meio"
-#: Merge.rc:2CEE4749
+#: Merge.rc:2CEE474A
#, c-format
msgid "Missing Left:"
msgstr "Faltas da Esquerda:"
msgid "Select Codepage for"
msgstr "Seleccionar página de código para"
-#: Merge.rc:5A9A713E
+#: Merge.rc:5A9A713F
#, c-format
msgid "&File Loading:"
msgstr "Carregar &Ficheiro:"
msgid "Syntax"
msgstr ""
+#: Merge.rc:2FC0BA7D
+#, c-format
+msgid "Markers"
+msgstr ""
+
#: Merge.rc:2C1D73C8
#, c-format
msgid "Version Control"
msgid "Bold"
msgstr "Aldine"
+#: Merge.rc:5A9A713E
+#, c-format
+msgid "&Enable marker"
+msgstr ""
+
+#: Merge.rc:2CEE4749
+#, c-format
+msgid "Marker colors"
+msgstr ""
+
+#: Merge.rc:56BD1FBA
+#, c-format
+msgid "Search Marker:"
+msgstr ""
+
+#: Merge.rc:7B76381B
+#, c-format
+msgid "User Defined Marker1:"
+msgstr ""
+
+#: Merge.rc:7B76381C
+#, c-format
+msgid "User Defined Marker2:"
+msgstr ""
+
+#: Merge.rc:7B76381D
+#, c-format
+msgid "User Defined Marker3:"
+msgstr ""
+
#: Merge.rc:387F7980
#, c-format
msgid "Folder Compare Report"
msgid "Middle:"
msgstr ""
-#: Merge.rc:2CEE4749
+#: Merge.rc:2CEE474A
#, c-format
msgid "Missing Left:"
msgstr ""
msgid "Select Codepage for"
msgstr "Selecteazã codare caractere pentru"
-#: Merge.rc:5A9A713E
+#: Merge.rc:5A9A713F
#, c-format
msgid "&File Loading:"
msgstr "Încãrcare &fiºier:"
msgid "Syntax"
msgstr ""
+#: Merge.rc:2FC0BA7D
+#, c-format
+msgid "Markers"
+msgstr ""
+
#: Merge.rc:2C1D73C8
#, c-format
msgid "Version Control"
msgid "Bold"
msgstr "Æèðíûé"
+#: Merge.rc:5A9A713E
+#, c-format
+msgid "&Enable marker"
+msgstr ""
+
+#: Merge.rc:2CEE4749
+#, c-format
+msgid "Marker colors"
+msgstr ""
+
+#: Merge.rc:56BD1FBA
+#, c-format
+msgid "Search Marker:"
+msgstr ""
+
+#: Merge.rc:7B76381B
+#, c-format
+msgid "User Defined Marker1:"
+msgstr ""
+
+#: Merge.rc:7B76381C
+#, c-format
+msgid "User Defined Marker2:"
+msgstr ""
+
+#: Merge.rc:7B76381D
+#, c-format
+msgid "User Defined Marker3:"
+msgstr ""
+
#: Merge.rc:387F7980
#, c-format
msgid "Folder Compare Report"
msgid "Middle:"
msgstr ""
-#: Merge.rc:2CEE4749
+#: Merge.rc:2CEE474A
#, c-format
msgid "Missing Left:"
msgstr ""
msgid "Select Codepage for"
msgstr "Âûáðàòü êîäîâóþ ñòðàíèöó äëÿ"
-#: Merge.rc:5A9A713E
+#: Merge.rc:5A9A713F
#, c-format
msgid "&File Loading:"
msgstr "Çàãðóçêà ôàéëà:"
msgid "Syntax"
msgstr ""
+#: Merge.rc:2FC0BA7D
+#, c-format
+msgid "Markers"
+msgstr ""
+
#: Merge.rc:2C1D73C8
#, c-format
msgid "Version Control"
msgid "Bold"
msgstr "Ïîäåá\9aàíî"
+#: Merge.rc:5A9A713E
+#, c-format
+msgid "&Enable marker"
+msgstr ""
+
+#: Merge.rc:2CEE4749
+#, c-format
+msgid "Marker colors"
+msgstr ""
+
+#: Merge.rc:56BD1FBA
+#, c-format
+msgid "Search Marker:"
+msgstr ""
+
+#: Merge.rc:7B76381B
+#, c-format
+msgid "User Defined Marker1:"
+msgstr ""
+
+#: Merge.rc:7B76381C
+#, c-format
+msgid "User Defined Marker2:"
+msgstr ""
+
+#: Merge.rc:7B76381D
+#, c-format
+msgid "User Defined Marker3:"
+msgstr ""
+
#: Merge.rc:387F7980
#, c-format
msgid "Folder Compare Report"
msgid "Middle:"
msgstr ""
-#: Merge.rc:2CEE4749
+#: Merge.rc:2CEE474A
#, c-format
msgid "Missing Left:"
msgstr ""
msgid "Select Codepage for"
msgstr "Îäàáåðè êîäíó ñòðàíó çà"
-#: Merge.rc:5A9A713E
+#: Merge.rc:5A9A713F
#, c-format
msgid "&File Loading:"
msgstr "Ó&÷èòàâà\9cå äàòîòåêå:"
msgid "Syntax"
msgstr ""
+#: Merge.rc:2FC0BA7D
+#, c-format
+msgid "Markers"
+msgstr ""
+
#: Merge.rc:2C1D73C8
#, c-format
msgid "Version Control"
msgid "Bold"
msgstr "Hrubo"
+#: Merge.rc:5A9A713E
+#, c-format
+msgid "&Enable marker"
+msgstr ""
+
+#: Merge.rc:2CEE4749
+#, c-format
+msgid "Marker colors"
+msgstr ""
+
+#: Merge.rc:56BD1FBA
+#, c-format
+msgid "Search Marker:"
+msgstr ""
+
+#: Merge.rc:7B76381B
+#, c-format
+msgid "User Defined Marker1:"
+msgstr ""
+
+#: Merge.rc:7B76381C
+#, c-format
+msgid "User Defined Marker2:"
+msgstr ""
+
+#: Merge.rc:7B76381D
+#, c-format
+msgid "User Defined Marker3:"
+msgstr ""
+
#: Merge.rc:387F7980
#, c-format
msgid "Folder Compare Report"
msgid "Middle:"
msgstr ""
-#: Merge.rc:2CEE4749
+#: Merge.rc:2CEE474A
#, c-format
msgid "Missing Left:"
msgstr ""
msgid "Select Codepage for"
msgstr "Zvo¾te kódovú stránku pre"
-#: Merge.rc:5A9A713E
+#: Merge.rc:5A9A713F
#, c-format
msgid "&File Loading:"
msgstr "&Naèítanie súboru:"
msgid "Syntax"
msgstr ""
+#: Merge.rc:2FC0BA7D
+#, c-format
+msgid "Markers"
+msgstr ""
+
#: Merge.rc:2C1D73C8
#, c-format
msgid "Version Control"
msgid "Bold"
msgstr "Krepko"
+#: Merge.rc:5A9A713E
+#, c-format
+msgid "&Enable marker"
+msgstr ""
+
+#: Merge.rc:2CEE4749
+#, c-format
+msgid "Marker colors"
+msgstr ""
+
+#: Merge.rc:56BD1FBA
+#, c-format
+msgid "Search Marker:"
+msgstr ""
+
+#: Merge.rc:7B76381B
+#, c-format
+msgid "User Defined Marker1:"
+msgstr ""
+
+#: Merge.rc:7B76381C
+#, c-format
+msgid "User Defined Marker2:"
+msgstr ""
+
+#: Merge.rc:7B76381D
+#, c-format
+msgid "User Defined Marker3:"
+msgstr ""
+
#: Merge.rc:387F7980
#, c-format
msgid "Folder Compare Report"
msgid "Middle:"
msgstr ""
-#: Merge.rc:2CEE4749
+#: Merge.rc:2CEE474A
#, c-format
msgid "Missing Left:"
msgstr ""
msgid "Select Codepage for"
msgstr "Izberi kodno tabelo datoteke za"
-#: Merge.rc:5A9A713E
+#: Merge.rc:5A9A713F
#, c-format
msgid "&File Loading:"
msgstr "&nalaganje datoteke:"
msgid "Syntax"
msgstr "Sintaksa"
+#: Merge.rc:2FC0BA7D
+#, c-format
+msgid "Markers"
+msgstr ""
+
#: Merge.rc:2C1D73C8
#, c-format
msgid "Version Control"
msgid "Bold"
msgstr "Negrita"
+#: Merge.rc:5A9A713E
+#, c-format
+msgid "&Enable marker"
+msgstr ""
+
+#: Merge.rc:2CEE4749
+#, c-format
+msgid "Marker colors"
+msgstr ""
+
+#: Merge.rc:56BD1FBA
+#, c-format
+msgid "Search Marker:"
+msgstr ""
+
+#: Merge.rc:7B76381B
+#, c-format
+msgid "User Defined Marker1:"
+msgstr ""
+
+#: Merge.rc:7B76381C
+#, c-format
+msgid "User Defined Marker2:"
+msgstr ""
+
+#: Merge.rc:7B76381D
+#, c-format
+msgid "User Defined Marker3:"
+msgstr ""
+
#: Merge.rc:387F7980
#, c-format
msgid "Folder Compare Report"
msgid "Middle:"
msgstr ""
-#: Merge.rc:2CEE4749
+#: Merge.rc:2CEE474A
#, c-format
msgid "Missing Left:"
msgstr ""
msgid "Select Codepage for"
msgstr "Seleccione página de códigos para"
-#: Merge.rc:5A9A713E
+#: Merge.rc:5A9A713F
#, c-format
msgid "&File Loading:"
msgstr "&Carga de archivos:"
msgid "Syntax"
msgstr ""
+#: Merge.rc:2FC0BA7D
+#, c-format
+msgid "Markers"
+msgstr ""
+
#: Merge.rc:2C1D73C8
#, c-format
msgid "Version Control"
msgid "Bold"
msgstr "Fet"
+#: Merge.rc:5A9A713E
+#, c-format
+msgid "&Enable marker"
+msgstr ""
+
+#: Merge.rc:2CEE4749
+#, c-format
+msgid "Marker colors"
+msgstr ""
+
+#: Merge.rc:56BD1FBA
+#, c-format
+msgid "Search Marker:"
+msgstr ""
+
+#: Merge.rc:7B76381B
+#, c-format
+msgid "User Defined Marker1:"
+msgstr ""
+
+#: Merge.rc:7B76381C
+#, c-format
+msgid "User Defined Marker2:"
+msgstr ""
+
+#: Merge.rc:7B76381D
+#, c-format
+msgid "User Defined Marker3:"
+msgstr ""
+
#: Merge.rc:387F7980
#, c-format
msgid "Folder Compare Report"
msgid "Middle:"
msgstr ""
-#: Merge.rc:2CEE4749
+#: Merge.rc:2CEE474A
#, c-format
msgid "Missing Left:"
msgstr ""
msgid "Select Codepage for"
msgstr "Välj Codepage för"
-#: Merge.rc:5A9A713E
+#: Merge.rc:5A9A713F
#, c-format
msgid "&File Loading:"
msgstr "&Filöppnande:"
msgid "Syntax"
msgstr "Syntax"
+#: Merge.rc:2FC0BA7D
+#, c-format
+msgid "Markers"
+msgstr ""
+
#: Merge.rc:2C1D73C8
#, c-format
msgid "Version Control"
msgid "Bold"
msgstr "Koyu"
+#: Merge.rc:5A9A713E
+#, c-format
+msgid "&Enable marker"
+msgstr ""
+
+#: Merge.rc:2CEE4749
+#, c-format
+msgid "Marker colors"
+msgstr ""
+
+#: Merge.rc:56BD1FBA
+#, c-format
+msgid "Search Marker:"
+msgstr ""
+
+#: Merge.rc:7B76381B
+#, c-format
+msgid "User Defined Marker1:"
+msgstr ""
+
+#: Merge.rc:7B76381C
+#, c-format
+msgid "User Defined Marker2:"
+msgstr ""
+
+#: Merge.rc:7B76381D
+#, c-format
+msgid "User Defined Marker3:"
+msgstr ""
+
#: Merge.rc:387F7980
#, c-format
msgid "Folder Compare Report"
msgid "Middle:"
msgstr ""
-#: Merge.rc:2CEE4749
+#: Merge.rc:2CEE474A
#, c-format
msgid "Missing Left:"
msgstr ""
msgid "Select Codepage for"
msgstr "Þunun için Kod Sayfasý Seçin"
-#: Merge.rc:5A9A713E
+#: Merge.rc:5A9A713F
#, c-format
msgid "&File Loading:"
msgstr "&Dosya Yükleniyor:"
msgid "Syntax"
msgstr ""
+#: Merge.rc:2FC0BA7D
+#, c-format
+msgid "Markers"
+msgstr ""
+
#: Merge.rc:2C1D73C8
#, c-format
msgid "Version Control"
msgid "Bold"
msgstr "Ãðóáèé"
+#: Merge.rc:5A9A713E
+#, c-format
+msgid "&Enable marker"
+msgstr ""
+
+#: Merge.rc:2CEE4749
+#, c-format
+msgid "Marker colors"
+msgstr ""
+
+#: Merge.rc:56BD1FBA
+#, c-format
+msgid "Search Marker:"
+msgstr ""
+
+#: Merge.rc:7B76381B
+#, c-format
+msgid "User Defined Marker1:"
+msgstr ""
+
+#: Merge.rc:7B76381C
+#, c-format
+msgid "User Defined Marker2:"
+msgstr ""
+
+#: Merge.rc:7B76381D
+#, c-format
+msgid "User Defined Marker3:"
+msgstr ""
+
#: Merge.rc:387F7980
#, c-format
msgid "Folder Compare Report"
msgid "Middle:"
msgstr ""
-#: Merge.rc:2CEE4749
+#: Merge.rc:2CEE474A
#, c-format
msgid "Missing Left:"
msgstr ""
msgid "Select Codepage for"
msgstr "Âèáðàòè ñòîð³íêó êîäóâàííÿ äëÿ"
-#: Merge.rc:5A9A713E
+#: Merge.rc:5A9A713F
#, c-format
msgid "&File Loading:"
msgstr "Çàâàíò. ôàéëó:"
msgid "Syntax"
msgstr ""
+#: Merge.rc:2FC0BA7D
+#, c-format
+msgid "Markers"
+msgstr ""
+
#: Merge.rc:2C1D73C8
#, c-format
msgid "Version Control"
OSDN Git Service
