Navigate selection history via log jump up/down button
[TortoiseGit.git] / src / TortoiseMerge / TortoiseMerge.vcxproj
blob840dc641032386937893f03a719e3700a70ebaed
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>Crypt32.lib;shlwapi.lib;Version.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\ProfilingInfo.cpp" />\r
67     <ClCompile Include="..\Utils\TaskbarUUID.cpp" />\r
68     <ClCompile Include="EditorConfigWrapper.cpp" />\r
69     <ClCompile Include="EncodingDlg.cpp" />\r
70     <ClCompile Include="EOL.cpp" />\r
71     <ClCompile Include="libsvn_diff\adler32.c">\r
72       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
73       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
74       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
75     </ClCompile>\r
76     <ClCompile Include="libsvn_diff\atomic.c">\r
77       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
78       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
79       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
80     </ClCompile>\r
81     <ClCompile Include="libsvn_diff\deprecated.c">\r
82       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
83       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
84       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
85     </ClCompile>\r
86     <ClCompile Include="libsvn_diff\eol.c">\r
87       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
88       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
89       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
90       <ObjectFileName>$(IntDir)eolc.obj</ObjectFileName>\r
91     </ClCompile>\r
92     <ClCompile Include="libsvn_diff\hash.c">\r
93       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
94       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
95       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
96     </ClCompile>\r
97     <ClCompile Include="libsvn_diff\iter.c">\r
98       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
99       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
100       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
101     </ClCompile>\r
102     <ClCompile Include="libsvn_diff\mergeinfo.c">\r
103       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
104       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
105       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
106     </ClCompile>\r
107     <ClCompile Include="libsvn_diff\mutex.c">\r
108       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
109       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
110       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
111     </ClCompile>\r
112     <ClCompile Include="libsvn_diff\properties.c">\r
113       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
114       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
115       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
116     </ClCompile>\r
117     <ClCompile Include="libsvn_diff\sorts.c">\r
118       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
119       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
120       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
121     </ClCompile>\r
122     <ClCompile Include="libsvn_diff\spillbuf.c">\r
123       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
124       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
125       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
126       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
127     </ClCompile>\r
128     <ClCompile Include="libsvn_diff\types.c">\r
129       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
130       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
131       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
132     </ClCompile>\r
133     <ClCompile Include="Patch.cpp" />\r
134     <ClCompile Include="TempFile.cpp" />\r
135     <ClCompile Include="AboutDlg.cpp" />\r
136     <ClCompile Include="BaseView.cpp" />\r
137     <ClCompile Include="BottomView.cpp" />\r
138     <ClCompile Include="DiffColors.cpp" />\r
139     <ClCompile Include="DiffData.cpp" />\r
140     <ClCompile Include="FilePatchesDlg.cpp" />\r
141     <ClCompile Include="FileTextLines.cpp" />\r
142     <ClCompile Include="FindDlg.cpp" />\r
143     <ClCompile Include="GotoLineDlg.cpp" />\r
144     <ClCompile Include="..\Git\GitPatch.cpp" />\r
145     <ClCompile Include="..\Utils\MiscUI\HTMLFormatter.cpp" />\r
146     <ClCompile Include="..\Utils\MiscUI\MessageBox.cpp" />\r
147     <ClCompile Include="LeftView.cpp" />\r
148     <ClCompile Include="LineDiffBar.cpp" />\r
149     <ClCompile Include="LocatorBar.cpp" />\r
150     <ClCompile Include="MainFrm.cpp" />\r
151     <ClCompile Include="MovedBlocks.cpp" />\r
152     <ClCompile Include="OpenDlg.cpp" />\r
153     <ClCompile Include="RegexFilterDlg.cpp" />\r
154     <ClCompile Include="RegexFiltersDlg.cpp" />\r
155     <ClCompile Include="..\Utils\MiscUI\SysProgressDlg.cpp" />\r
156     <ClCompile Include="RightView.cpp" />\r
157     <ClCompile Include="SetColorPage.cpp" />\r
158     <ClCompile Include="SetMainPage.cpp" />\r
159     <ClCompile Include="Settings.cpp" />\r
160     <ClCompile Include="stdafx.cpp">\r
161       <PrecompiledHeader>Create</PrecompiledHeader>\r
162     </ClCompile>\r
163     <ClCompile Include="..\Git\GitAdminDir.cpp" />\r
164     <ClCompile Include="TortoiseMerge.cpp" />\r
165     <ClCompile Include="Undo.cpp" />\r
166     <ClCompile Include="ViewData.cpp" />\r
167     <ClCompile Include="WorkingFile.cpp" />\r
168     <ClCompile Include="AppUtils.cpp" />\r
169     <ClCompile Include="..\Utils\MiscUI\BrowseFolder.cpp" />\r
170     <ClCompile Include="..\Utils\CmdLineParser.cpp" />\r
171     <ClCompile Include="..\Utils\MiscUI\DIB.cpp" />\r
172     <ClCompile Include="..\Utils\DirFileEnum.cpp" />\r
173     <ClCompile Include="..\Utils\DragDropImpl.cpp" />\r
174     <ClCompile Include="..\Utils\MiscUI\FileDropEdit.cpp" />\r
175     <ClCompile Include="..\Utils\MiscUI\HistoryCombo.cpp" />\r
176     <ClCompile Include="..\Utils\MiscUI\HyperLink.cpp" />\r
177     <ClCompile Include="..\Utils\PathUtils.cpp" />\r
178     <ClCompile Include="..\Utils\Registry.cpp" />\r
179     <ClCompile Include="..\Utils\MiscUI\ScrollTool.cpp" />\r
180     <ClCompile Include="..\Utils\StringUtils.cpp" />\r
181     <ClCompile Include="..\Utils\SysInfo.cpp" />\r
182     <ClCompile Include="..\Utils\UnicodeUtils.cpp" />\r
183     <ClCompile Include="..\Utils\MiscUI\WaterEffect.cpp" />\r
184     <ClCompile Include="XSplitter.cpp" />\r
185     <ClCompile Include="libsvn_diff\checksum.c">\r
186       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
187       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
188       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
189     </ClCompile>\r
190     <ClCompile Include="libsvn_diff\cmdline.c">\r
191       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
192       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
193       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
194     </ClCompile>\r
195     <ClCompile Include="libsvn_diff\ctype.c">\r
196       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
197       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
198       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
199     </ClCompile>\r
200     <ClCompile Include="libsvn_diff\diff.c">\r
201       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
202       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
203       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
204     </ClCompile>\r
205     <ClCompile Include="libsvn_diff\diff3.c">\r
206       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
207       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
208       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
209     </ClCompile>\r
210     <ClCompile Include="libsvn_diff\diff4.c">\r
211       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
212       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
213       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
214     </ClCompile>\r
215     <ClCompile Include="libsvn_diff\diff_file.c">\r
216       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
217       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
218       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
219     </ClCompile>\r
220     <ClCompile Include="libsvn_diff\diff_memory.c">\r
221       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
222       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
223       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
224     </ClCompile>\r
225     <ClCompile Include="libsvn_diff\dirent_uri.c">\r
226       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
227       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
228       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
229     </ClCompile>\r
230     <ClCompile Include="libsvn_diff\dso.c">\r
231       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
232       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
233       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
234     </ClCompile>\r
235     <ClCompile Include="libsvn_diff\error.c">\r
236       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
237       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
238       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
239     </ClCompile>\r
240     <ClCompile Include="libsvn_diff\io.c">\r
241       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
242       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
243       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
244     </ClCompile>\r
245     <ClCompile Include="libsvn_diff\lcs.c">\r
246       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
247       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
248       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
249     </ClCompile>\r
250     <ClCompile Include="libsvn_diff\md5.c">\r
251       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
252       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
253       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
254     </ClCompile>\r
255     <ClCompile Include="libsvn_diff\path.c">\r
256       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
257       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
258       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
259     </ClCompile>\r
260     <ClCompile Include="libsvn_diff\pool.c">\r
261       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
262       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
263       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
264     </ClCompile>\r
265     <ClCompile Include="libsvn_diff\sha1.c">\r
266       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
267       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
268       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
269     </ClCompile>\r
270     <ClCompile Include="libsvn_diff\stream.c">\r
271       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
272       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
273       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
274     </ClCompile>\r
275     <ClCompile Include="libsvn_diff\string.c">\r
276       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
277       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
278       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
279     </ClCompile>\r
280     <ClCompile Include="libsvn_diff\SVNLineDiff.cpp">\r
281       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
282       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
283       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
284     </ClCompile>\r
285     <ClCompile Include="libsvn_diff\token.c">\r
286       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
287       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
288       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
289     </ClCompile>\r
290     <ClCompile Include="libsvn_diff\utf.c">\r
291       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
292       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
293       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
294     </ClCompile>\r
295     <ClCompile Include="libsvn_diff\utf_validate.c">\r
296       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
297       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
298       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
299     </ClCompile>\r
300     <ClCompile Include="libsvn_diff\util.c">\r
301       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
302       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
303       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
304     </ClCompile>\r
305     <ClCompile Include="libsvn_diff\win32_xlate.c">\r
306       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
307       <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
308       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
309     </ClCompile>\r
310   </ItemGroup>\r
311   <ItemGroup>\r
312     <ClInclude Include="..\Git\Git.h" />\r
313     <ClInclude Include="..\Git\GitForWindows.h" />\r
314     <ClInclude Include="..\Git\gittype.h" />\r
315     <ClInclude Include="..\Git\MassiveGitTaskBase.h" />\r
316     <ClInclude Include="..\Git\TGitPath.h" />\r
317     <ClInclude Include="..\Utils\CommonAppUtils.h" />\r
318     <ClInclude Include="..\Utils\DebugOutput.h" />\r
319     <ClInclude Include="..\Utils\MiscUI\FileDlgEventHandler.h" />\r
320     <ClInclude Include="..\Utils\MiscUI\IconBitmapUtils.h" />\r
321     <ClInclude Include="..\Utils\MiscUI\IconMenu.h" />\r
322     <ClInclude Include="..\Utils\MiscUI\LineColors.h" />\r
323     <ClInclude Include="..\Utils\MiscUI\StandAloneDlg.h" />\r
324     <ClInclude Include="..\Utils\MiscUI\TripleClick.h" />\r
325     <ClInclude Include="..\Utils\ProfilingInfo.h" />\r
326     <ClInclude Include="..\Utils\SimpleIni.h" />\r
327     <ClInclude Include="..\Utils\TaskbarUUID.h" />\r
328     <ClInclude Include="EditorConfigWrapper.h" />\r
329     <ClInclude Include="EncodingDlg.h" />\r
330     <ClInclude Include="TempFile.h" />\r
331     <ClInclude Include="AboutDlg.h" />\r
332     <ClInclude Include="BaseView.h" />\r
333     <ClInclude Include="BottomView.h" />\r
334     <ClInclude Include="CustomMFCRibbonButton.h" />\r
335     <ClInclude Include="DiffColors.h" />\r
336     <ClInclude Include="DiffData.h" />\r
337     <ClInclude Include="DiffStates.h" />\r
338     <ClInclude Include="EOL.h" />\r
339     <ClInclude Include="FilePatchesDlg.h" />\r
340     <ClInclude Include="FileTextLines.h" />\r
341     <ClInclude Include="FindDlg.h" />\r
342     <ClInclude Include="GotoLineDlg.h" />\r
343     <ClInclude Include="..\Git\GitPatch.h" />\r
344     <ClInclude Include="..\Utils\MiscUI\HTMLFormatter.h" />\r
345     <ClInclude Include="LeftView.h" />\r
346     <ClInclude Include="LineDiffBar.h" />\r
347     <ClInclude Include="LocatorBar.h" />\r
348     <ClInclude Include="MainFrm.h" />\r
349     <ClInclude Include="MovedBlocks.h" />\r
350     <ClInclude Include="OpenDlg.h" />\r
351     <ClInclude Include="Patch.h" />\r
352     <ClInclude Include="RegexFilterDlg.h" />\r
353     <ClInclude Include="RegexFiltersDlg.h" />\r
354     <ClInclude Include="..\Utils\MiscUI\SysProgressDlg.h" />\r
355     <ClInclude Include="resource.h" />\r
356     <ClInclude Include="RightView.h" />\r
357     <ClInclude Include="SetColorPage.h" />\r
358     <ClInclude Include="SetMainPage.h" />\r
359     <ClInclude Include="Settings.h" />\r
360     <ClInclude Include="stdafx.h" />\r
361     <ClInclude Include="..\Git\GitAdminDir.h" />\r
362     <ClInclude Include="TortoiseMerge.h" />\r
363     <ClInclude Include="Undo.h" />\r
364     <ClInclude Include="ViewData.h" />\r
365     <ClInclude Include="WorkingFile.h" />\r
366     <ClInclude Include="AppUtils.h" />\r
367     <ClInclude Include="..\Utils\MiscUI\BrowseFolder.h" />\r
368     <ClInclude Include="..\Utils\CmdLineParser.h" />\r
369     <ClInclude Include="..\Utils\MiscUI\DIB.h" />\r
370     <ClInclude Include="..\Utils\DirFileEnum.h" />\r
371     <ClInclude Include="..\Utils\DragDropImpl.h" />\r
372     <ClInclude Include="..\Utils\MiscUI\FileDropEdit.h" />\r
373     <ClInclude Include="..\Utils\MiscUI\HistoryCombo.h" />\r
374     <ClInclude Include="..\Utils\MiscUI\HyperLink.h" />\r
375     <ClInclude Include="..\Utils\MiscUI\MessageBox.h" />\r
376     <ClInclude Include="..\Utils\PathUtils.h" />\r
377     <ClInclude Include="..\Utils\registry.h" />\r
378     <ClInclude Include="..\Utils\MiscUI\ScrollTool.h" />\r
379     <ClInclude Include="..\Utils\StringUtils.h" />\r
380     <ClInclude Include="..\Utils\SysInfo.h" />\r
381     <ClInclude Include="..\Utils\UnicodeUtils.h" />\r
382     <ClInclude Include="..\Utils\MiscUI\WaterEffect.h" />\r
383   </ItemGroup>\r
384   <ItemGroup>\r
385     <None Include="..\Resources\download.avi" />\r
386     <None Include="..\Resources\ignorecomments.txt" />\r
387     <None Include="..\Resources\lineadded.ico" />\r
388     <None Include="..\Resources\lineconflicted.ico" />\r
389     <None Include="..\Resources\lineconflictedignored.ico" />\r
390     <None Include="..\Resources\lineedited.ico" />\r
391     <None Include="..\Resources\LineEndingCR.ico" />\r
392     <None Include="..\Resources\LineEndingCRLF.ico" />\r
393     <None Include="..\Resources\LineEndingLF.ico" />\r
394     <None Include="..\Resources\lineequal.ico" />\r
395     <None Include="..\Resources\linemarked.ico" />\r
396     <None Include="..\Resources\lineremoved.ico" />\r
397     <None Include="..\Resources\linewhitespace.ico" />\r
398     <None Include="..\Resources\Margin.cur" />\r
399     <None Include="..\Resources\moved.ico" />\r
400     <None Include="..\Resources\RegexFilter.ini" />\r
401     <None Include="..\Resources\ribbon.mfcribbon-ms" />\r
402     <None Include="..\Resources\ribbon\ribbonlarge.png" />\r
403     <None Include="..\Resources\ribbon\ribbonlargehdpi.png" />\r
404     <None Include="..\Resources\ribbon\ribbonsmall.png" />\r
405     <None Include="..\Resources\ribbon\ribbonsmallhdpi.png" />\r
406     <None Include="..\Resources\ribbon\TortoiseMerge.png" />\r
407     <None Include="..\Resources\Toolbar.bmp" />\r
408     <None Include="..\Resources\TortoiseMerge.ico" />\r
409     <None Include="..\Resources\TortoiseMerge.rc2" />\r
410     <None Include="..\Resources\tortoisemerge_logoflipped.bmp" />\r
411     <None Include="..\Resources\ttf_glyph.bmp" />\r
412   </ItemGroup>\r
413   <ItemGroup>\r
414     <ResourceCompile Include="..\Resources\TortoiseMergeENG.rc" />\r
415   </ItemGroup>\r
416   <ItemGroup>\r
417     <ProjectReference Include="..\..\ext\build\editorconfig.vcxproj">\r
418       <Project>{da843306-3d6d-4198-890e-25e6177e01c3}</Project>\r
419     </ProjectReference>\r
420     <ProjectReference Include="..\..\ext\build\libapr.vcxproj">\r
421       <Project>{4472028d-4acf-474e-aa95-9b7e12b50f60}</Project>\r
422       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
423     </ProjectReference>\r
424     <ProjectReference Include="..\..\ext\build\libaprutil.vcxproj">\r
425       <Project>{6bd19bae-4041-4e85-b576-aac9d54caab9}</Project>\r
426       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
427     </ProjectReference>\r
428     <ProjectReference Include="..\..\ext\build\libgit2.vcxproj">\r
429       <Project>{2b4f366c-93ba-491e-87af-5ef7b37f75f7}</Project>\r
430     </ProjectReference>\r
431     <ProjectReference Include="..\..\ext\build\xml.vcxproj">\r
432       <Project>{ae6aafba-9992-452a-9eb8-dd69402a4ace}</Project>\r
433       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
434     </ProjectReference>\r
435     <ProjectReference Include="..\..\ext\build\zlib.vcxproj">\r
436       <Project>{5c6b6a95-2053-4593-9617-c4f176736d5a}</Project>\r
437     </ProjectReference>\r
438     <ProjectReference Include="..\..\ext\gitdll\gitdll.vcxproj">\r
439       <Project>{4f0a55de-dafd-4a0b-a03d-2c14cb77e08f}</Project>\r
440     </ProjectReference>\r
441     <ProjectReference Include="..\..\ext\ResizableLib\ResizableLib.vcxproj">\r
442       <Project>{4be529fb-c2f2-49f7-a897-054b955564cf}</Project>\r
443       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
444     </ProjectReference>\r
445   </ItemGroup>\r
446   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
447   <ImportGroup Label="ExtensionTargets">\r
448   </ImportGroup>\r
449 </Project>