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