| blob | 3d1540305034b2488b1eeefacfd34cfe0f00b8fd |
1 <?xml version="1.0" encoding="utf-8"?>\r
2 <Project DefaultTargets="Build" ToolsVersion="4.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="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
28 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
29 <ConfigurationType>Application</ConfigurationType>\r
30 <PlatformToolset>v110_xp</PlatformToolset>\r
31 <UseOfMfc>Dynamic</UseOfMfc>\r
32 <CharacterSet>Unicode</CharacterSet>\r
33 <WholeProgramOptimization>true</WholeProgramOptimization>\r
34 </PropertyGroup>\r
35 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
36 <ConfigurationType>Application</ConfigurationType>\r
37 <PlatformToolset>v110_xp</PlatformToolset>\r
38 <UseOfMfc>Dynamic</UseOfMfc>\r
39 <CharacterSet>Unicode</CharacterSet>\r
40 </PropertyGroup>\r
41 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
42 <ConfigurationType>Application</ConfigurationType>\r
43 <PlatformToolset>v110_xp</PlatformToolset>\r
44 <UseOfMfc>Dynamic</UseOfMfc>\r
45 <CharacterSet>Unicode</CharacterSet>\r
46 <WholeProgramOptimization>true</WholeProgramOptimization>\r
47 </PropertyGroup>\r
48 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
49 <ConfigurationType>Application</ConfigurationType>\r
50 <PlatformToolset>v110_xp</PlatformToolset>\r
51 <UseOfMfc>Dynamic</UseOfMfc>\r
52 <CharacterSet>Unicode</CharacterSet>\r
53 </PropertyGroup>\r
54 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
55 <ImportGroup Label="ExtensionSettings">\r
56 </ImportGroup>\r
57 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
58 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
59 <Import Project="$(SolutionDir)TortoiseGit.common.props" />\r
60 </ImportGroup>\r
61 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">\r
62 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
63 <Import Project="$(SolutionDir)TortoiseGit.common.props" />\r
64 </ImportGroup>\r
65 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">\r
66 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
67 <Import Project="$(SolutionDir)TortoiseGit.common.props" />\r
68 </ImportGroup>\r
69 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">\r
70 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
71 <Import Project="$(SolutionDir)TortoiseGit.common.props" />\r
72 </ImportGroup>\r
73 <PropertyGroup Label="UserMacros" />\r
74 <PropertyGroup>\r
75 <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
76 </PropertyGroup>\r
77 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
78 <ClCompile>\r
79 <AdditionalIncludeDirectories>..\TortoiseMerge;..\..\ext\gitdll;..\git;.\svninclude;..\..\ext\apr\include;..\..\ext\apr-util\include;.\libsvn_diff;..\Utils;..\;..\Utils\MiscUI;..\..\ext\ResizableLib;..\..\ext\libgit2\include;..\..\ext\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
80 <PreprocessorDefinitions>APR_DECLARE_STATIC;APU_DECLARE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
81 </ClCompile>\r
82 <ResourceCompile>\r
83 <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
84 </ResourceCompile>\r
85 <Link>\r
86 <AdditionalDependencies>Crypt32.lib;shlwapi.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
87 </Link>\r
88 </ItemDefinitionGroup>\r
89 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
90 <ClCompile>\r
91 <AdditionalIncludeDirectories>..\TortoiseMerge;..\..\ext\gitdll;..\git;.\svninclude;..\..\ext\apr\include;..\..\ext\apr-util\include;.\libsvn_diff;..\Utils;..\;..\Utils\MiscUI;..\..\ext\ResizableLib;..\..\ext\libgit2\include;..\..\ext\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
92 <PreprocessorDefinitions>APR_DECLARE_STATIC;APU_DECLARE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
93 </ClCompile>\r
94 <ResourceCompile>\r
95 <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
96 </ResourceCompile>\r
97 <Link>\r
98 <AdditionalDependencies>Crypt32.lib;shlwapi.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
99 </Link>\r
100 </ItemDefinitionGroup>\r
101 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
102 <ClCompile>\r
103 <AdditionalIncludeDirectories>..\TortoiseMerge;..\..\ext\gitdll;..\git;.\svninclude;..\..\ext\apr\include;..\..\ext\apr-util\include;.\libsvn_diff;..\Utils;..\;..\Utils\MiscUI;..\..\ext\ResizableLib;..\..\ext\libgit2\include;..\..\ext\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
104 <PreprocessorDefinitions>APR_DECLARE_STATIC;APU_DECLARE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
105 </ClCompile>\r
106 <ResourceCompile>\r
107 <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
108 </ResourceCompile>\r
109 <Link>\r
110 <AdditionalDependencies>Crypt32.lib;shlwapi.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
111 </Link>\r
112 </ItemDefinitionGroup>\r
113 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
114 <ClCompile>\r
115 <AdditionalIncludeDirectories>..\TortoiseMerge;..\..\ext\gitdll;..\git;.\svninclude;..\..\ext\apr\include;..\..\ext\apr-util\include;.\libsvn_diff;..\Utils;..\;..\Utils\MiscUI;..\..\ext\ResizableLib;..\..\ext\libgit2\include;..\..\ext\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
116 <PreprocessorDefinitions>APR_DECLARE_STATIC;APU_DECLARE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
117 </ClCompile>\r
118 <ResourceCompile>\r
119 <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
120 </ResourceCompile>\r
121 <Link>\r
122 <AdditionalDependencies>Crypt32.lib;shlwapi.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
123 </Link>\r
124 </ItemDefinitionGroup>\r
125 <ItemGroup>\r
126 <ClCompile Include="..\Utils\accHelper.cpp">\r
127 <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
128 </ClCompile>\r
129 <ClCompile Include="..\Utils\CommonAppUtils.cpp" />\r
130 <ClCompile Include="..\Utils\MiscUI\FileDlgEventHandler.cpp" />\r
131 <ClCompile Include="..\Utils\MiscUI\IconMenu.cpp" />\r
132 <ClCompile Include="..\Utils\MiscUI\StandAloneDlg.cpp" />\r
133 <ClCompile Include="..\Utils\ProfilingInfo.cpp" />\r
134 <ClCompile Include="..\Utils\TaskbarUUID.cpp" />\r
135 <ClCompile Include="EncodingDlg.cpp" />\r
136 <ClCompile Include="libsvn_diff\adler32.c">\r
137 <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
138 <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
139 <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
140 </ClCompile>\r
141 <ClCompile Include="libsvn_diff\atomic.c">\r
142 <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
143 <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
144 <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
145 </ClCompile>\r
146 <ClCompile Include="libsvn_diff\deprecated.c">\r
147 <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
148 <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
149 <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
150 </ClCompile>\r
151 <ClCompile Include="libsvn_diff\eol.c">\r
152 <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
153 <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
154 <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
155 </ClCompile>\r
156 <ClCompile Include="libsvn_diff\hash.c">\r
157 <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
158 <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
159 <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
160 </ClCompile>\r
161 <ClCompile Include="libsvn_diff\iter.c">\r
162 <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
163 <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
164 <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
165 </ClCompile>\r
166 <ClCompile Include="libsvn_diff\mergeinfo.c">\r
167 <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
168 <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
169 <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
170 </ClCompile>\r
171 <ClCompile Include="libsvn_diff\mutex.c">\r
172 <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
173 <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
174 <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
175 </ClCompile>\r
176 <ClCompile Include="libsvn_diff\properties.c">\r
177 <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
178 <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
179 <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
180 </ClCompile>\r
181 <ClCompile Include="libsvn_diff\sorts.c">\r
182 <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
183 <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
184 <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
185 </ClCompile>\r
186 <ClCompile Include="libsvn_diff\spillbuf.c">\r
187 <PrecompiledHeader>NotUsing</PrecompiledHeader>\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\types.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="Patch.cpp" />\r
198 <ClCompile Include="TempFile.cpp" />\r
199 <ClCompile Include="AboutDlg.cpp" />\r
200 <ClCompile Include="BaseView.cpp" />\r
201 <ClCompile Include="BottomView.cpp" />\r
202 <ClCompile Include="DiffColors.cpp" />\r
203 <ClCompile Include="DiffData.cpp" />\r
204 <ClCompile Include="FilePatchesDlg.cpp" />\r
205 <ClCompile Include="FileTextLines.cpp" />\r
206 <ClCompile Include="FindDlg.cpp" />\r
207 <ClCompile Include="GotoLineDlg.cpp" />\r
208 <ClCompile Include="..\Git\GitPatch.cpp" />\r
209 <ClCompile Include="..\Utils\MiscUI\HTMLFormatter.cpp" />\r
210 <ClCompile Include="..\Utils\MiscUI\MessageBox.cpp" />\r
211 <ClCompile Include="LeftView.cpp" />\r
212 <ClCompile Include="LineDiffBar.cpp" />\r
213 <ClCompile Include="LocatorBar.cpp" />\r
214 <ClCompile Include="MainFrm.cpp" />\r
215 <ClCompile Include="MovedBlocks.cpp" />\r
216 <ClCompile Include="OpenDlg.cpp" />\r
217 <ClCompile Include="..\Utils\MiscUI\SysProgressDlg.cpp" />\r
218 <ClCompile Include="RightView.cpp" />\r
219 <ClCompile Include="SetColorPage.cpp" />\r
220 <ClCompile Include="SetMainPage.cpp" />\r
221 <ClCompile Include="Settings.cpp" />\r
222 <ClCompile Include="stdafx.cpp">\r
223 <PrecompiledHeader>Create</PrecompiledHeader>\r
224 </ClCompile>\r
225 <ClCompile Include="..\Git\GitAdminDir.cpp" />\r
226 <ClCompile Include="TortoiseMerge.cpp" />\r
227 <ClCompile Include="Undo.cpp" />\r
228 <ClCompile Include="ViewData.cpp" />\r
229 <ClCompile Include="WorkingFile.cpp" />\r
230 <ClCompile Include="AppUtils.cpp" />\r
231 <ClCompile Include="..\Utils\MiscUI\BrowseFolder.cpp" />\r
232 <ClCompile Include="..\Utils\CmdLineParser.cpp" />\r
233 <ClCompile Include="..\Utils\MiscUI\DIB.cpp" />\r
234 <ClCompile Include="..\Utils\DirFileEnum.cpp" />\r
235 <ClCompile Include="..\Utils\DragDropImpl.cpp">\r
236 <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
237 </ClCompile>\r
238 <ClCompile Include="..\Utils\MiscUI\FileDropEdit.cpp" />\r
239 <ClCompile Include="..\Utils\MiscUI\HistoryCombo.cpp" />\r
240 <ClCompile Include="..\Utils\MiscUI\HyperLink.cpp" />\r
241 <ClCompile Include="..\Utils\PathUtils.cpp" />\r
242 <ClCompile Include="..\Utils\Registry.cpp" />\r
243 <ClCompile Include="..\Utils\MiscUI\ScrollTool.cpp" />\r
244 <ClCompile Include="..\Utils\StringUtils.cpp" />\r
245 <ClCompile Include="..\Utils\SysInfo.cpp" />\r
246 <ClCompile Include="..\Utils\UnicodeUtils.cpp" />\r
247 <ClCompile Include="..\Utils\MiscUI\WaterEffect.cpp" />\r
248 <ClCompile Include="XSplitter.cpp" />\r
249 <ClCompile Include="libsvn_diff\checksum.c">\r
250 <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
251 <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
252 <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
253 </ClCompile>\r
254 <ClCompile Include="libsvn_diff\cmdline.c">\r
255 <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
256 <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
257 <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
258 </ClCompile>\r
259 <ClCompile Include="libsvn_diff\ctype.c">\r
260 <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
261 <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
262 <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
263 </ClCompile>\r
264 <ClCompile Include="libsvn_diff\diff.c">\r
265 <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
266 <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
267 <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
268 </ClCompile>\r
269 <ClCompile Include="libsvn_diff\diff3.c">\r
270 <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
271 <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
272 <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
273 </ClCompile>\r
274 <ClCompile Include="libsvn_diff\diff4.c">\r
275 <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
276 <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
277 <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
278 </ClCompile>\r
279 <ClCompile Include="libsvn_diff\diff_file.c">\r
280 <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
281 <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
282 <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
283 </ClCompile>\r
284 <ClCompile Include="libsvn_diff\diff_memory.c">\r
285 <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
286 <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
287 <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
288 </ClCompile>\r
289 <ClCompile Include="libsvn_diff\dirent_uri.c">\r
290 <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
291 <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
292 <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
293 </ClCompile>\r
294 <ClCompile Include="libsvn_diff\dso.c">\r
295 <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
296 <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
297 <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
298 </ClCompile>\r
299 <ClCompile Include="libsvn_diff\error.c">\r
300 <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
301 <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
302 <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
303 </ClCompile>\r
304 <ClCompile Include="libsvn_diff\io.c">\r
305 <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
306 <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
307 <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
308 </ClCompile>\r
309 <ClCompile Include="libsvn_diff\lcs.c">\r
310 <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
311 <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
312 <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
313 </ClCompile>\r
314 <ClCompile Include="libsvn_diff\md5.c">\r
315 <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
316 <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
317 <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
318 </ClCompile>\r
319 <ClCompile Include="libsvn_diff\path.c">\r
320 <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
321 <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
322 <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
323 </ClCompile>\r
324 <ClCompile Include="libsvn_diff\pool.c">\r
325 <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
326 <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
327 <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
328 </ClCompile>\r
329 <ClCompile Include="libsvn_diff\sha1.c">\r
330 <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
331 <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
332 <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
333 </ClCompile>\r
334 <ClCompile Include="libsvn_diff\stream.c">\r
335 <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
336 <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
337 <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
338 </ClCompile>\r
339 <ClCompile Include="libsvn_diff\string.c">\r
340 <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
341 <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
342 <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
343 </ClCompile>\r
344 <ClCompile Include="libsvn_diff\SVNLineDiff.cpp">\r
345 <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
346 <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
347 <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
348 </ClCompile>\r
349 <ClCompile Include="libsvn_diff\token.c">\r
350 <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
351 <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
352 <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
353 </ClCompile>\r
354 <ClCompile Include="libsvn_diff\utf.c">\r
355 <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
356 <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
357 <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
358 </ClCompile>\r
359 <ClCompile Include="libsvn_diff\utf_validate.c">\r
360 <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
361 <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
362 <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
363 </ClCompile>\r
364 <ClCompile Include="libsvn_diff\util.c">\r
365 <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
366 <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
367 <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
368 </ClCompile>\r
369 <ClCompile Include="libsvn_diff\win32_xlate.c">\r
370 <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
371 <PreprocessorDefinitions>WIN32;WINNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
372 <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
373 </ClCompile>\r
374 </ItemGroup>\r
375 <ItemGroup>\r
376 <ClInclude Include="..\Utils\CommonAppUtils.h" />\r
377 <ClInclude Include="..\Utils\MiscUI\FileDlgEventHandler.h" />\r
378 <ClInclude Include="..\Utils\MiscUI\IconMenu.h" />\r
379 <ClInclude Include="..\Utils\MiscUI\LineColors.h" />\r
380 <ClInclude Include="..\Utils\MiscUI\StandAloneDlg.h" />\r
381 <ClInclude Include="..\Utils\MiscUI\TripleClick.h" />\r
382 <ClInclude Include="..\Utils\ProfilingInfo.h" />\r
383 <ClInclude Include="..\Utils\TaskbarUUID.h" />\r
384 <ClInclude Include="EncodingDlg.h" />\r
385 <ClInclude Include="Patch.h" />\r
386 <ClInclude Include="TempFile.h" />\r
387 <ClInclude Include="AboutDlg.h" />\r
388 <ClInclude Include="BaseView.h" />\r
389 <ClInclude Include="BottomView.h" />\r
390 <ClInclude Include="CustomMFCRibbonButton.h" />\r
391 <ClInclude Include="DiffColors.h" />\r
392 <ClInclude Include="DiffData.h" />\r
393 <ClInclude Include="DiffStates.h" />\r
394 <ClInclude Include="EOL.h" />\r
395 <ClInclude Include="FilePatchesDlg.h" />\r
396 <ClInclude Include="FileTextLines.h" />\r
397 <ClInclude Include="FindDlg.h" />\r
398 <ClInclude Include="GotoLineDlg.h" />\r
399 <ClInclude Include="..\Git\GitPatch.h" />\r
400 <ClInclude Include="..\Utils\MiscUI\HTMLFormatter.h" />\r
401 <ClInclude Include="LeftView.h" />\r
402 <ClInclude Include="LineDiffBar.h" />\r
403 <ClInclude Include="LocatorBar.h" />\r
404 <ClInclude Include="MainFrm.h" />\r
405 <ClInclude Include="MovedBlocks.h" />\r
406 <ClInclude Include="OpenDlg.h" />\r
407 <ClInclude Include="..\Utils\MiscUI\SysProgressDlg.h" />\r
408 <ClInclude Include="resource.h" />\r
409 <ClInclude Include="RightView.h" />\r
410 <ClInclude Include="SetColorPage.h" />\r
411 <ClInclude Include="SetMainPage.h" />\r
412 <ClInclude Include="Settings.h" />\r
413 <ClInclude Include="stdafx.h" />\r
414 <ClInclude Include="..\Gut\GitAdminDir.h" />\r
415 <ClInclude Include="TortoiseMerge.h" />\r
416 <ClInclude Include="Undo.h" />\r
417 <ClInclude Include="ViewData.h" />\r
418 <ClInclude Include="WorkingFile.h" />\r
419 <ClInclude Include="AppUtils.h" />\r
420 <ClInclude Include="..\Utils\MiscUI\BrowseFolder.h" />\r
421 <ClInclude Include="..\Utils\CmdLineParser.h" />\r
422 <ClInclude Include="..\Utils\MiscUI\DIB.h" />\r
423 <ClInclude Include="..\Utils\DirFileEnum.h" />\r
424 <ClInclude Include="..\Utils\DragDropImpl.h" />\r
425 <ClInclude Include="..\Utils\MiscUI\FileDropEdit.h" />\r
426 <ClInclude Include="..\Utils\MiscUI\HistoryCombo.h" />\r
427 <ClInclude Include="..\Utils\MiscUI\HyperLink.h" />\r
428 <ClInclude Include="..\Utils\MiscUI\MessageBox.h" />\r
429 <ClInclude Include="..\Utils\PathUtils.h" />\r
430 <ClInclude Include="..\Utils\registry.h" />\r
431 <ClInclude Include="..\Utils\MiscUI\ScrollTool.h" />\r
432 <ClInclude Include="..\Utils\StringUtils.h" />\r
433 <ClInclude Include="..\Utils\SysInfo.h" />\r
434 <ClInclude Include="..\Utils\UnicodeUtils.h" />\r
435 <ClInclude Include="..\Utils\MiscUI\WaterEffect.h" />\r
436 </ItemGroup>\r
437 <ItemGroup>\r
438 <None Include="..\Resources\download.avi" />\r
439 <None Include="..\Resources\lineadded.ico" />\r
440 <None Include="..\Resources\lineconflicted.ico" />\r
441 <None Include="..\Resources\lineconflictedignored.ico" />\r
442 <None Include="..\Resources\lineedited.ico" />\r
443 <None Include="..\Resources\LineEndingCR.ico" />\r
444 <None Include="..\Resources\LineEndingCRLF.ico" />\r
445 <None Include="..\Resources\LineEndingLF.ico" />\r
446 <None Include="..\Resources\lineequal.ico" />\r
447 <None Include="..\Resources\lineremoved.ico" />\r
448 <None Include="..\Resources\linewhitespace.ico" />\r
449 <None Include="..\Resources\Margin.cur" />\r
450 <None Include="..\Resources\moved.ico" />\r
451 <None Include="..\Resources\ribbon.mfcribbon-ms" />\r
452 <None Include="..\Resources\ribbon\ribbonlarge.png" />\r
453 <None Include="..\Resources\ribbon\ribbonsmall.png" />\r
454 <None Include="..\Resources\ribbon\TortoiseMerge.png" />\r
455 <None Include="..\Resources\Toolbar.bmp" />\r
456 <None Include="..\Resources\TortoiseMerge.ico" />\r
457 <None Include="..\Resources\TortoiseMerge.rc2" />\r
458 <None Include="..\Resources\tortoisemerge_logoflipped.bmp" />\r
459 <None Include="..\Resources\tortoisesvn_logoflipped.bmp" />\r
460 <None Include="..\Resources\ttf_glyph.bmp" />\r
461 </ItemGroup>\r
462 <ItemGroup>\r
463 <ResourceCompile Include="..\Resources\TortoiseMergeENG.rc" />\r
464 </ItemGroup>\r
465 <ItemGroup>\r
466 <ProjectReference Include="..\..\ext\build\libapr.vcxproj">\r
467 <Project>{4472028d-4acf-474e-aa95-9b7e12b50f60}</Project>\r
468 <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
469 </ProjectReference>\r
470 <ProjectReference Include="..\..\ext\build\libaprutil.vcxproj">\r
471 <Project>{6bd19bae-4041-4e85-b576-aac9d54caab9}</Project>\r
472 <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
473 </ProjectReference>\r
474 <ProjectReference Include="..\..\ext\build\libgit2.vcxproj">\r
475 <Project>{2b4f366c-93ba-491e-87af-5ef7b37f75f7}</Project>\r
476 </ProjectReference>\r
477 <ProjectReference Include="..\..\ext\build\xml.vcxproj">\r
478 <Project>{ae6aafba-9992-452a-9eb8-dd69402a4ace}</Project>\r
479 <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
480 </ProjectReference>\r
481 <ProjectReference Include="..\..\ext\ResizableLib\ResizableLib.vcxproj">\r
482 <Project>{4be529fb-c2f2-49f7-a897-054b955564cf}</Project>\r
483 <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
484 </ProjectReference>\r
485 <ProjectReference Include="..\Git\Git.vcxproj">\r
486 <Project>{7ca5b1eb-8cc9-40a6-96d8-83649c1a870b}</Project>\r
487 <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
488 </ProjectReference>\r
489 </ItemGroup>\r
490 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
491 <ImportGroup Label="ExtensionTargets">\r
492 </ImportGroup>\r
493 </Project>