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