src/TortoiseMerge/TortoiseMerge.vcxproj

   1 <?xml version="1.0" encoding="utf-8"?>\r
   2 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   3   <ItemGroup Label="ProjectConfigurations">\r
   4     <ProjectConfiguration Include="Debug|Win32">\r
   5       <Configuration>Debug</Configuration>\r
   6       <Platform>Win32</Platform>\r
   7     </ProjectConfiguration>\r
   8     <ProjectConfiguration Include="Debug|x64">\r
   9       <Configuration>Debug</Configuration>\r
  10       <Platform>x64</Platform>\r
  11     </ProjectConfiguration>\r
  12     <ProjectConfiguration Include="Release|Win32">\r
  13       <Configuration>Release</Configuration>\r
  14       <Platform>Win32</Platform>\r
  15     </ProjectConfiguration>\r
  16     <ProjectConfiguration Include="Release|x64">\r
  17       <Configuration>Release</Configuration>\r
  18       <Platform>x64</Platform>\r
  19     </ProjectConfiguration>\r
  20   </ItemGroup>\r
  21   <PropertyGroup Label="Globals">\r
  22     <ProjectName>TortoiseGitMerge</ProjectName>\r
  23     <ProjectGuid>{8ABB4F84-891A-4748-8507-F5494842173E}</ProjectGuid>\r
  24     <RootNamespace>TortoiseMerge</RootNamespace>\r
  25     <Keyword>MFCProj</Keyword>\r
  26   </PropertyGroup>\r
  27   <Import Project="$(SolutionDir)TortoiseGit.toolset.props" />\r
  28   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
  29   <PropertyGroup Label="Configuration">\r
  30     <ConfigurationType>Application</ConfigurationType>\r
  31     <UseOfMfc>Dynamic</UseOfMfc>\r
  32     <CharacterSet>Unicode</CharacterSet>\r
  33   </PropertyGroup>\r
  34   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">\r
  35     <WholeProgramOptimization>true</WholeProgramOptimization>\r
  36   </PropertyGroup>\r
  37   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
  38   <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
  39   <Import Project="$(SolutionDir)TortoiseGit.common.props" />\r
  40   <PropertyGroup Label="UserMacros" />\r
  41   <ItemDefinitionGroup>\r
  42     <ClCompile>\r
  43       <AdditionalIncludeDirectories>$(ProjectDir);..\..\ext\gitdll;..\git;.\svninclude;..\..\ext\apr\include;..\..\ext\apr-util\include;.\libsvn_diff;..\Utils;..\;..\Utils\MiscUI;..\..\ext\ResizableLib;..\..\ext\libgit2\include;..\..\ext\zlib;..\..\ext\editorconfig\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
  44       <PreprocessorDefinitions>APR_DECLARE_STATIC;APU_DECLARE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
  45     </ClCompile>\r
  46     <ResourceCompile>\r
  47       <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
  48     </ResourceCompile>\r
  49     <Link>\r
  50       <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
  51     </Link>\r
  52   </ItemDefinitionGroup>\r
  53   <ItemGroup>\r
  54     <ClCompile Include="..\Git\Git.cpp" />\r
  55     <ClCompile Include="..\Git\MassiveGitTaskBase.cpp" />\r
  56     <ClCompile Include="..\Git\TGitPath.cpp" />\r
  57     <ClCompile Include="..\Utils\accHelper.cpp">\r
  58       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
  59     </ClCompile>\r
  60     <ClCompile Include="..\Utils\CommonAppUtils.cpp" />\r
  61     <ClCompile Include="..\Utils\DebugOutput.cpp" />\r
  62     <ClCompile Include="..\Utils\MiscUI\FileDlgEventHandler.cpp" />\r
  63     <ClCompile Include="..\Utils\MiscUI\IconBitmapUtils.cpp" />\r
  64     <ClCompile Include="..\Utils\MiscUI\IconMenu.cpp" />\r
  65     <ClCompile Include="..\Utils\MiscUI\StandAloneDlg.cpp" />\r
  66     <ClCompile Include="..\Utils\MiscUI\Tooltip.cpp" />\r
  67     <ClCompile Include="..\Utils\ProfilingInfo.cpp" />\r
  68     <ClCompile Include="..\Utils\SysImageList.cpp" />\r
  69     <ClCompile Include="..\Utils\TaskbarUUID.cpp" />\r
  70     <ClCompile Include="EditorConfigWrapper.cpp" />\r
  71     <ClCompile Include="EncodingDlg.cpp" />\r
  72     <ClCompile Include="EOL.cpp" />\r
  73     <ClCompile Include="libsvn_diff\adler32.c">\r
  74       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
  75       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
  76       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
  77     </ClCompile>\r
  78     <ClCompile Include="libsvn_diff\atomic.c">\r
  79       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
  80       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
  81       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
  82     </ClCompile>\r
  83     <ClCompile Include="libsvn_diff\deprecated.c">\r
  84       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
  85       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
  86       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
  87     </ClCompile>\r
  88     <ClCompile Include="libsvn_diff\eol.c">\r
  89       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
  90       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
  91       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
  92       <ObjectFileName>$(IntDir)eolc.obj</ObjectFileName>\r
  93     </ClCompile>\r
  94     <ClCompile Include="libsvn_diff\hash.c">\r
  95       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
  96       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
  97       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
  98     </ClCompile>\r
  99     <ClCompile Include="libsvn_diff\iter.c">\r
 100       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
 101       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
 102       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
 103     </ClCompile>\r
 104     <ClCompile Include="libsvn_diff\mergeinfo.c">\r
 105       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
 106       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
 107       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
 108     </ClCompile>\r
 109     <ClCompile Include="libsvn_diff\mutex.c">\r
 110       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
 111       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
 112       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
 113     </ClCompile>\r
 114     <ClCompile Include="libsvn_diff\properties.c">\r
 115       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
 116       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
 117       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
 118     </ClCompile>\r
 119     <ClCompile Include="libsvn_diff\sorts.c">\r
 120       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
 121       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
 122       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
 123     </ClCompile>\r
 124     <ClCompile Include="libsvn_diff\spillbuf.c">\r
 125       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
 126       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
 127       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
 128       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
 129     </ClCompile>\r
 130     <ClCompile Include="libsvn_diff\types.c">\r
 131       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
 132       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
 133       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
 134     </ClCompile>\r
 135     <ClCompile Include="NativeRibbonApp.cpp" />\r
 136     <ClCompile Include="Patch.cpp" />\r
 137     <ClCompile Include="TempFile.cpp" />\r
 138     <ClCompile Include="AboutDlg.cpp" />\r
 139     <ClCompile Include="BaseView.cpp" />\r
 140     <ClCompile Include="BottomView.cpp" />\r
 141     <ClCompile Include="DiffColors.cpp" />\r
 142     <ClCompile Include="DiffData.cpp" />\r
 143     <ClCompile Include="FilePatchesDlg.cpp" />\r
 144     <ClCompile Include="FileTextLines.cpp" />\r
 145     <ClCompile Include="FindDlg.cpp" />\r
 146     <ClCompile Include="GotoLineDlg.cpp" />\r
 147     <ClCompile Include="..\Git\GitPatch.cpp" />\r
 148     <ClCompile Include="..\Utils\MiscUI\MessageBox.cpp" />\r
 149     <ClCompile Include="LeftView.cpp" />\r
 150     <ClCompile Include="LineDiffBar.cpp" />\r
 151     <ClCompile Include="LocatorBar.cpp" />\r
 152     <ClCompile Include="MainFrm.cpp" />\r
 153     <ClCompile Include="MovedBlocks.cpp" />\r
 154     <ClCompile Include="OpenDlg.cpp" />\r
 155     <ClCompile Include="RegexFilterDlg.cpp" />\r
 156     <ClCompile Include="RegexFiltersDlg.cpp" />\r
 157     <ClCompile Include="..\Utils\MiscUI\SysProgressDlg.cpp" />\r
 158     <ClCompile Include="RightView.cpp" />\r
 159     <ClCompile Include="SetColorPage.cpp" />\r
 160     <ClCompile Include="SetMainPage.cpp" />\r
 161     <ClCompile Include="Settings.cpp" />\r
 162     <ClCompile Include="stdafx.cpp">\r
 163       <PrecompiledHeader>Create</PrecompiledHeader>\r
 164     </ClCompile>\r
 165     <ClCompile Include="..\Git\GitAdminDir.cpp" />\r
 166     <ClCompile Include="TortoiseMerge.cpp" />\r
 167     <ClCompile Include="Undo.cpp" />\r
 168     <ClCompile Include="ViewData.cpp" />\r
 169     <ClCompile Include="WorkingFile.cpp" />\r
 170     <ClCompile Include="AppUtils.cpp" />\r
 171     <ClCompile Include="..\Utils\MiscUI\BrowseFolder.cpp" />\r
 172     <ClCompile Include="..\Utils\CmdLineParser.cpp" />\r
 173     <ClCompile Include="..\Utils\MiscUI\DIB.cpp" />\r
 174     <ClCompile Include="..\Utils\DirFileEnum.cpp" />\r
 175     <ClCompile Include="..\Utils\DragDropImpl.cpp" />\r
 176     <ClCompile Include="..\Utils\MiscUI\FileDropEdit.cpp" />\r
 177     <ClCompile Include="..\Utils\MiscUI\HistoryCombo.cpp" />\r
 178     <ClCompile Include="..\Utils\MiscUI\HyperLink.cpp" />\r
 179     <ClCompile Include="..\Utils\PathUtils.cpp" />\r
 180     <ClCompile Include="..\Utils\Registry.cpp" />\r
 181     <ClCompile Include="..\Utils\MiscUI\ScrollTool.cpp" />\r
 182     <ClCompile Include="..\Utils\StringUtils.cpp" />\r
 183     <ClCompile Include="..\Utils\SysInfo.cpp" />\r
 184     <ClCompile Include="..\Utils\UnicodeUtils.cpp" />\r
 185     <ClCompile Include="..\Utils\MiscUI\WaterEffect.cpp" />\r
 186     <ClCompile Include="XSplitter.cpp" />\r
 187     <ClCompile Include="libsvn_diff\checksum.c">\r
 188       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
 189       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
 190       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
 191     </ClCompile>\r
 192     <ClCompile Include="libsvn_diff\cmdline.c">\r
 193       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
 194       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
 195       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
 196     </ClCompile>\r
 197     <ClCompile Include="libsvn_diff\ctype.c">\r
 198       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
 199       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
 200       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
 201     </ClCompile>\r
 202     <ClCompile Include="libsvn_diff\diff.c">\r
 203       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
 204       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
 205       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
 206     </ClCompile>\r
 207     <ClCompile Include="libsvn_diff\diff3.c">\r
 208       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
 209       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
 210       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
 211     </ClCompile>\r
 212     <ClCompile Include="libsvn_diff\diff4.c">\r
 213       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
 214       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
 215       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
 216     </ClCompile>\r
 217     <ClCompile Include="libsvn_diff\diff_file.c">\r
 218       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
 219       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
 220       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
 221     </ClCompile>\r
 222     <ClCompile Include="libsvn_diff\diff_memory.c">\r
 223       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
 224       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
 225       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
 226     </ClCompile>\r
 227     <ClCompile Include="libsvn_diff\dirent_uri.c">\r
 228       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
 229       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
 230       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
 231     </ClCompile>\r
 232     <ClCompile Include="libsvn_diff\dso.c">\r
 233       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
 234       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
 235       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
 236     </ClCompile>\r
 237     <ClCompile Include="libsvn_diff\error.c">\r
 238       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
 239       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
 240       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
 241     </ClCompile>\r
 242     <ClCompile Include="libsvn_diff\io.c">\r
 243       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
 244       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
 245       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
 246     </ClCompile>\r
 247     <ClCompile Include="libsvn_diff\lcs.c">\r
 248       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
 249       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
 250       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
 251     </ClCompile>\r
 252     <ClCompile Include="libsvn_diff\md5.c">\r
 253       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
 254       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
 255       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
 256     </ClCompile>\r
 257     <ClCompile Include="libsvn_diff\path.c">\r
 258       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
 259       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
 260       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
 261     </ClCompile>\r
 262     <ClCompile Include="libsvn_diff\pool.c">\r
 263       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
 264       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
 265       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
 266     </ClCompile>\r
 267     <ClCompile Include="libsvn_diff\sha1.c">\r
 268       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
 269       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
 270       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
 271     </ClCompile>\r
 272     <ClCompile Include="libsvn_diff\stream.c">\r
 273       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
 274       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
 275       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
 276     </ClCompile>\r
 277     <ClCompile Include="libsvn_diff\string.c">\r
 278       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
 279       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
 280       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
 281     </ClCompile>\r
 282     <ClCompile Include="libsvn_diff\SVNLineDiff.cpp">\r
 283       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
 284       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
 285       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
 286     </ClCompile>\r
 287     <ClCompile Include="libsvn_diff\token.c">\r
 288       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
 289       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
 290       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
 291     </ClCompile>\r
 292     <ClCompile Include="libsvn_diff\utf.c">\r
 293       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
 294       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
 295       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
 296     </ClCompile>\r
 297     <ClCompile Include="libsvn_diff\utf_validate.c">\r
 298       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
 299       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
 300       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
 301     </ClCompile>\r
 302     <ClCompile Include="libsvn_diff\util.c">\r
 303       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
 304       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
 305       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
 306     </ClCompile>\r
 307     <ClCompile Include="libsvn_diff\win32_xlate.c">\r
 308       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
 309       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
 310       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
 311     </ClCompile>\r
 312   </ItemGroup>\r
 313   <ItemGroup>\r
 314     <ClInclude Include="..\..\ext\simpleini\SimpleIni.h" />\r
 315     <ClInclude Include="..\Git\Git.h" />\r
 316     <ClInclude Include="..\Git\GitForWindows.h" />\r
 317     <ClInclude Include="..\Git\gittype.h" />\r
 318     <ClInclude Include="..\Git\MassiveGitTaskBase.h" />\r
 319     <ClInclude Include="..\Git\TGitPath.h" />\r
 320     <ClInclude Include="..\Utils\CommonAppUtils.h" />\r
 321     <ClInclude Include="..\Utils\CreateProcessHelper.h" />\r
 322     <ClInclude Include="..\Utils\DebugOutput.h" />\r
 323     <ClInclude Include="..\Utils\DPIAware.h" />\r
 324     <ClInclude Include="..\Utils\MiscUI\CommonDialogFunctions.h" />\r
 325     <ClInclude Include="..\Utils\MiscUI\FileDlgEventHandler.h" />\r
 326     <ClInclude Include="..\Utils\MiscUI\IconBitmapUtils.h" />\r
 327     <ClInclude Include="..\Utils\MiscUI\IconMenu.h" />\r
 328     <ClInclude Include="..\Utils\MiscUI\LineColors.h" />\r
 329     <ClInclude Include="..\Utils\MiscUI\StandAloneDlg.h" />\r
 330     <ClInclude Include="..\Utils\MiscUI\Tooltip.h" />\r
 331     <ClInclude Include="..\Utils\MiscUI\TripleClick.h" />\r
 332     <ClInclude Include="..\Utils\ProfilingInfo.h" />\r
 333     <ClInclude Include="..\Utils\SysImageList.h" />\r
 334     <ClInclude Include="..\Utils\TaskbarUUID.h" />\r
 335     <ClInclude Include="CustomMFCRibbonStatusBar.h" />\r
 336     <ClInclude Include="EditorConfigWrapper.h" />\r
 337     <ClInclude Include="EncodingDlg.h" />\r
 338     <ClInclude Include="NativeRibbonApp.h" />\r
 339     <ClInclude Include="TempFile.h" />\r
 340     <ClInclude Include="AboutDlg.h" />\r
 341     <ClInclude Include="BaseView.h" />\r
 342     <ClInclude Include="BottomView.h" />\r
 343     <ClInclude Include="DiffColors.h" />\r
 344     <ClInclude Include="DiffData.h" />\r
 345     <ClInclude Include="DiffStates.h" />\r
 346     <ClInclude Include="EOL.h" />\r
 347     <ClInclude Include="FilePatchesDlg.h" />\r
 348     <ClInclude Include="FileTextLines.h" />\r
 349     <ClInclude Include="FindDlg.h" />\r
 350     <ClInclude Include="GotoLineDlg.h" />\r
 351     <ClInclude Include="..\Git\GitPatch.h" />\r
 352     <ClInclude Include="LeftView.h" />\r
 353     <ClInclude Include="LineDiffBar.h" />\r
 354     <ClInclude Include="LocatorBar.h" />\r
 355     <ClInclude Include="MainFrm.h" />\r
 356     <ClInclude Include="MovedBlocks.h" />\r
 357     <ClInclude Include="OpenDlg.h" />\r
 358     <ClInclude Include="Patch.h" />\r
 359     <ClInclude Include="RegexFilterDlg.h" />\r
 360     <ClInclude Include="RegexFiltersDlg.h" />\r
 361     <ClInclude Include="..\Utils\MiscUI\SysProgressDlg.h" />\r
 362     <ClInclude Include="resource.h" />\r
 363     <ClInclude Include="RightView.h" />\r
 364     <ClInclude Include="SetColorPage.h" />\r
 365     <ClInclude Include="SetMainPage.h" />\r
 366     <ClInclude Include="Settings.h" />\r
 367     <ClInclude Include="stdafx.h" />\r
 368     <ClInclude Include="..\Git\GitAdminDir.h" />\r
 369     <ClInclude Include="TortoiseMerge.h" />\r
 370     <ClInclude Include="Undo.h" />\r
 371     <ClInclude Include="ViewData.h" />\r
 372     <ClInclude Include="WorkingFile.h" />\r
 373     <ClInclude Include="AppUtils.h" />\r
 374     <ClInclude Include="..\Utils\MiscUI\BrowseFolder.h" />\r
 375     <ClInclude Include="..\Utils\CmdLineParser.h" />\r
 376     <ClInclude Include="..\Utils\MiscUI\DIB.h" />\r
 377     <ClInclude Include="..\Utils\DirFileEnum.h" />\r
 378     <ClInclude Include="..\Utils\DragDropImpl.h" />\r
 379     <ClInclude Include="..\Utils\MiscUI\FileDropEdit.h" />\r
 380     <ClInclude Include="..\Utils\MiscUI\HistoryCombo.h" />\r
 381     <ClInclude Include="..\Utils\MiscUI\HyperLink.h" />\r
 382     <ClInclude Include="..\Utils\MiscUI\MessageBox.h" />\r
 383     <ClInclude Include="..\Utils\PathUtils.h" />\r
 384     <ClInclude Include="..\Utils\registry.h" />\r
 385     <ClInclude Include="..\Utils\MiscUI\ScrollTool.h" />\r
 386     <ClInclude Include="..\Utils\StringUtils.h" />\r
 387     <ClInclude Include="..\Utils\SysInfo.h" />\r
 388     <ClInclude Include="..\Utils\UnicodeUtils.h" />\r
 389     <ClInclude Include="..\Utils\MiscUI\WaterEffect.h" />\r
 390   </ItemGroup>\r
 391   <ItemGroup>\r
 392     <None Include="..\Resources\ignorecomments.txt" />\r
 393     <None Include="..\Resources\lineadded.ico" />\r
 394     <None Include="..\Resources\lineconflicted.ico" />\r
 395     <None Include="..\Resources\lineconflictedignored.ico" />\r
 396     <None Include="..\Resources\lineedited.ico" />\r
 397     <None Include="..\Resources\LineEndingCR.ico" />\r
 398     <None Include="..\Resources\LineEndingCRLF.ico" />\r
 399     <None Include="..\Resources\LineEndingLF.ico" />\r
 400     <None Include="..\Resources\lineequal.ico" />\r
 401     <None Include="..\Resources\linemarked.ico" />\r
 402     <None Include="..\Resources\lineremoved.ico" />\r
 403     <None Include="..\Resources\linewhitespace.ico" />\r
 404     <None Include="..\Resources\Margin.cur" />\r
 405     <None Include="..\Resources\moved.ico" />\r
 406     <None Include="..\Resources\RegexFilter.ini" />\r
 407     <None Include="..\Resources\ribbon\TortoiseMerge.png" />\r
 408     <None Include="..\Resources\Toolbar.bmp" />\r
 409     <None Include="..\Resources\TortoiseMerge.ico" />\r
 410     <None Include="..\Resources\TortoiseMerge.rc2" />\r
 411     <None Include="..\Resources\tortoisemerge_logoflipped.bmp" />\r
 412     <None Include="..\Resources\ttf_glyph.bmp" />\r
 413   </ItemGroup>\r
 414   <ItemGroup>\r
 415     <ResourceCompile Include="..\Resources\TortoiseMergeENG.rc" />\r
 416   </ItemGroup>\r
 417   <ItemGroup>\r
 418     <ProjectReference Include="..\..\ext\build\editorconfig.vcxproj">\r
 419       <Project>{da843306-3d6d-4198-890e-25e6177e01c3}</Project>\r
 420     </ProjectReference>\r
 421     <ProjectReference Include="..\..\ext\build\libapr.vcxproj">\r
 422       <Project>{4472028d-4acf-474e-aa95-9b7e12b50f60}</Project>\r
 423       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
 424     </ProjectReference>\r
 425     <ProjectReference Include="..\..\ext\build\libaprutil.vcxproj">\r
 426       <Project>{6bd19bae-4041-4e85-b576-aac9d54caab9}</Project>\r
 427       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
 428     </ProjectReference>\r
 429     <ProjectReference Include="..\..\ext\build\libgit2.vcxproj">\r
 430       <Project>{2b4f366c-93ba-491e-87af-5ef7b37f75f7}</Project>\r
 431     </ProjectReference>\r
 432     <ProjectReference Include="..\..\ext\build\xml.vcxproj">\r
 433       <Project>{ae6aafba-9992-452a-9eb8-dd69402a4ace}</Project>\r
 434       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
 435     </ProjectReference>\r
 436     <ProjectReference Include="..\..\ext\build\zlib.vcxproj">\r
 437       <Project>{5c6b6a95-2053-4593-9617-c4f176736d5a}</Project>\r
 438     </ProjectReference>\r
 439     <ProjectReference Include="..\..\ext\gitdll\gitdll.vcxproj">\r
 440       <Project>{4f0a55de-dafd-4a0b-a03d-2c14cb77e08f}</Project>\r
 441     </ProjectReference>\r
 442     <ProjectReference Include="..\..\ext\ResizableLib\ResizableLib.vcxproj">\r
 443       <Project>{4be529fb-c2f2-49f7-a897-054b955564cf}</Project>\r
 444       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
 445     </ProjectReference>\r
 446   </ItemGroup>\r
 447   <ItemGroup>\r
 448     <CustomBuild Include="..\Resources\TortoiseGitMergeRibbon.xml">\r
 449       <Command>"$(WindowsSdkDir_10)bin\10.0.16299.0\x86\uicc.exe" "%(FullPath)" "$(IntDir)TortoiseGitMergeRibbon.bml" /header:"$(IntDir)TortoiseGitMergeRibbon.h" /res:"$(IntDir)TortoiseGitMergeRibbon.rc" /name:TortoiseGitMergeRibbon</Command>\r
 450       <Outputs>$(IntDir)TortoiseGitMergeRibbon.bml;$(IntDir)TortoiseGitMergeRibbon.rc;$(IntDir)TortoiseGitMergeRibbon.h;%(Outputs)</Outputs>\r
 451       <SubType>Designer</SubType>\r
 452     </CustomBuild>\r
 453   </ItemGroup>\r
 454   <ItemGroup>\r
 455     <Image Include="..\Resources\ribbon\Filter16.bmp" />\r
 456   </ItemGroup>\r
 457   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
 458   <ImportGroup Label="ExtensionTargets">\r
 459   </ImportGroup>\r
 460 </Project>