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
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
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
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
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
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
54 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
\r
55 <ImportGroup Label="ExtensionSettings">
\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
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
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
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
73 <PropertyGroup Label="UserMacros" />
\r
75 <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
\r
77 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
\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;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
80 <PreprocessorDefinitions>APR_DECLARE_STATIC;APU_DECLARE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
83 <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
86 <AdditionalDependencies>Crypt32.lib;shlwapi.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
\r
88 </ItemDefinitionGroup>
\r
89 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
\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;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
92 <PreprocessorDefinitions>APR_DECLARE_STATIC;APU_DECLARE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
95 <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
98 <AdditionalDependencies>Crypt32.lib;shlwapi.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
\r
100 </ItemDefinitionGroup>
\r
101 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
\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;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
104 <PreprocessorDefinitions>APR_DECLARE_STATIC;APU_DECLARE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
107 <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
110 <AdditionalDependencies>Crypt32.lib;shlwapi.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
\r
112 </ItemDefinitionGroup>
\r
113 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
\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;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
116 <PreprocessorDefinitions>APR_DECLARE_STATIC;APU_DECLARE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
119 <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
122 <AdditionalDependencies>Crypt32.lib;shlwapi.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
\r
124 </ItemDefinitionGroup>
\r
126 <ClCompile Include="..\Utils\accHelper.cpp">
\r
127 <PrecompiledHeader>NotUsing</PrecompiledHeader>
\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="Patch.cpp" />
\r
136 <ClCompile Include="TempFile.cpp" />
\r
137 <ClCompile Include="AboutDlg.cpp" />
\r
138 <ClCompile Include="BaseView.cpp" />
\r
139 <ClCompile Include="BottomView.cpp" />
\r
140 <ClCompile Include="DiffColors.cpp" />
\r
141 <ClCompile Include="DiffData.cpp" />
\r
142 <ClCompile Include="FilePatchesDlg.cpp" />
\r
143 <ClCompile Include="FileTextLines.cpp" />
\r
144 <ClCompile Include="FindDlg.cpp" />
\r
145 <ClCompile Include="GotoLineDlg.cpp" />
\r
146 <ClCompile Include="..\Git\GitPatch.cpp" />
\r
147 <ClCompile Include="..\Utils\MiscUI\HTMLFormatter.cpp" />
\r
148 <ClCompile Include="..\Utils\MiscUI\MessageBox.cpp" />
\r
149 <ClCompile Include="LeftView.cpp" />
\r
150 <ClCompile Include="LineDiffBar.cpp" />
\r
151 <ClCompile Include="LocatorBar.cpp" />
\r
152 <ClCompile Include="MainFrm.cpp" />
\r
153 <ClCompile Include="MovedBlocks.cpp" />
\r
154 <ClCompile Include="OpenDlg.cpp" />
\r
155 <ClCompile Include="..\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
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 <PrecompiledHeader>NotUsing</PrecompiledHeader>
\r
176 <ClCompile Include="..\Utils\MiscUI\FileDropEdit.cpp" />
\r
177 <ClCompile Include="..\Utils\MiscUI\HistoryCombo.cpp" />
\r
178 <ClCompile Include="..\Utils\MiscUI\HyperLink.cpp" />
\r
179 <ClCompile Include="..\Utils\PathUtils.cpp" />
\r
180 <ClCompile Include="..\Utils\Registry.cpp" />
\r
181 <ClCompile Include="..\Utils\MiscUI\ScrollTool.cpp" />
\r
182 <ClCompile Include="..\Utils\StringUtils.cpp" />
\r
183 <ClCompile Include="..\Utils\SysInfo.cpp" />
\r
184 <ClCompile Include="..\Utils\UnicodeUtils.cpp" />
\r
185 <ClCompile Include="..\Utils\MiscUI\WaterEffect.cpp" />
\r
186 <ClCompile Include="XSplitter.cpp" />
\r
187 <ClCompile Include="libsvn_diff\adler32.c">
\r
188 <PrecompiledHeader>NotUsing</PrecompiledHeader>
\r
189 <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
\r
191 <ClCompile Include="libsvn_diff\checksum.c">
\r
192 <PrecompiledHeader>NotUsing</PrecompiledHeader>
\r
193 <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
194 <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
\r
196 <ClCompile Include="libsvn_diff\cmdline.c">
\r
197 <PrecompiledHeader>NotUsing</PrecompiledHeader>
\r
198 <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
199 <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
\r
201 <ClCompile Include="libsvn_diff\compress.c">
\r
202 <PrecompiledHeader>NotUsing</PrecompiledHeader>
\r
203 <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
204 <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
\r
206 <ClCompile Include="libsvn_diff\crc32.c">
\r
207 <PrecompiledHeader>NotUsing</PrecompiledHeader>
\r
208 <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
209 <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
\r
211 <ClCompile Include="libsvn_diff\ctype.c">
\r
212 <PrecompiledHeader>NotUsing</PrecompiledHeader>
\r
213 <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
214 <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
\r
216 <ClCompile Include="libsvn_diff\deflate.c">
\r
217 <PrecompiledHeader>NotUsing</PrecompiledHeader>
\r
218 <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
219 <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
\r
221 <ClCompile Include="libsvn_diff\diff.c">
\r
222 <PrecompiledHeader>NotUsing</PrecompiledHeader>
\r
223 <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
224 <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
\r
226 <ClCompile Include="libsvn_diff\diff3.c">
\r
227 <PrecompiledHeader>NotUsing</PrecompiledHeader>
\r
228 <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
229 <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
\r
231 <ClCompile Include="libsvn_diff\diff4.c">
\r
232 <PrecompiledHeader>NotUsing</PrecompiledHeader>
\r
233 <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
234 <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
\r
236 <ClCompile Include="libsvn_diff\diff_file.c">
\r
237 <PrecompiledHeader>NotUsing</PrecompiledHeader>
\r
238 <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
239 <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
\r
241 <ClCompile Include="libsvn_diff\diff_memory.c">
\r
242 <PrecompiledHeader>NotUsing</PrecompiledHeader>
\r
243 <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
244 <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
\r
246 <ClCompile Include="libsvn_diff\dirent_uri.c">
\r
247 <PrecompiledHeader>NotUsing</PrecompiledHeader>
\r
248 <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
249 <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
\r
251 <ClCompile Include="libsvn_diff\dso.c">
\r
252 <PrecompiledHeader>NotUsing</PrecompiledHeader>
\r
253 <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
254 <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
\r
256 <ClCompile Include="libsvn_diff\error.c">
\r
257 <PrecompiledHeader>NotUsing</PrecompiledHeader>
\r
258 <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
259 <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
\r
261 <ClCompile Include="libsvn_diff\gzio.c">
\r
262 <PrecompiledHeader>NotUsing</PrecompiledHeader>
\r
263 <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
264 <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
\r
266 <ClCompile Include="libsvn_diff\infblock.c">
\r
267 <PrecompiledHeader>NotUsing</PrecompiledHeader>
\r
268 <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
269 <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
\r
271 <ClCompile Include="libsvn_diff\infcodes.c">
\r
272 <PrecompiledHeader>NotUsing</PrecompiledHeader>
\r
273 <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
274 <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
\r
276 <ClCompile Include="libsvn_diff\inffast.c">
\r
277 <PrecompiledHeader>NotUsing</PrecompiledHeader>
\r
278 <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
279 <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
\r
281 <ClCompile Include="libsvn_diff\inflate.c">
\r
282 <PrecompiledHeader>NotUsing</PrecompiledHeader>
\r
283 <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
284 <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
\r
286 <ClCompile Include="libsvn_diff\inftrees.c">
\r
287 <PrecompiledHeader>NotUsing</PrecompiledHeader>
\r
288 <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
289 <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
\r
291 <ClCompile Include="libsvn_diff\infutil.c">
\r
292 <PrecompiledHeader>NotUsing</PrecompiledHeader>
\r
293 <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
294 <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
\r
296 <ClCompile Include="libsvn_diff\io.c">
\r
297 <PrecompiledHeader>NotUsing</PrecompiledHeader>
\r
298 <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
299 <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
\r
301 <ClCompile Include="libsvn_diff\lcs.c">
\r
302 <PrecompiledHeader>NotUsing</PrecompiledHeader>
\r
303 <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
304 <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
\r
306 <ClCompile Include="libsvn_diff\maketree.c">
\r
307 <PrecompiledHeader>NotUsing</PrecompiledHeader>
\r
308 <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
309 <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
\r
311 <ClCompile Include="libsvn_diff\md5.c">
\r
312 <PrecompiledHeader>NotUsing</PrecompiledHeader>
\r
313 <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
314 <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
\r
316 <ClCompile Include="libsvn_diff\path.c">
\r
317 <PrecompiledHeader>NotUsing</PrecompiledHeader>
\r
318 <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
319 <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
\r
321 <ClCompile Include="libsvn_diff\pool.c">
\r
322 <PrecompiledHeader>NotUsing</PrecompiledHeader>
\r
323 <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
324 <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
\r
326 <ClCompile Include="libsvn_diff\sha1.c">
\r
327 <PrecompiledHeader>NotUsing</PrecompiledHeader>
\r
328 <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
329 <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
\r
331 <ClCompile Include="libsvn_diff\stream.c">
\r
332 <PrecompiledHeader>NotUsing</PrecompiledHeader>
\r
333 <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
334 <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
\r
336 <ClCompile Include="libsvn_diff\svn_string.c">
\r
337 <PrecompiledHeader>NotUsing</PrecompiledHeader>
\r
338 <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
339 <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
\r
341 <ClCompile Include="libsvn_diff\SVNLineDiff.cpp">
\r
342 <PrecompiledHeader>NotUsing</PrecompiledHeader>
\r
343 <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
344 <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
\r
346 <ClCompile Include="libsvn_diff\token.c">
\r
347 <PrecompiledHeader>NotUsing</PrecompiledHeader>
\r
348 <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
349 <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
\r
351 <ClCompile Include="libsvn_diff\trees.c">
\r
352 <PrecompiledHeader>NotUsing</PrecompiledHeader>
\r
353 <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
354 <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
\r
356 <ClCompile Include="libsvn_diff\uncompr.c">
\r
357 <PrecompiledHeader>NotUsing</PrecompiledHeader>
\r
358 <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
359 <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
\r
361 <ClCompile Include="libsvn_diff\unzip.c">
\r
362 <PrecompiledHeader>NotUsing</PrecompiledHeader>
\r
363 <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
364 <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
\r
366 <ClCompile Include="libsvn_diff\utf.c">
\r
367 <PrecompiledHeader>NotUsing</PrecompiledHeader>
\r
368 <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
369 <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
\r
371 <ClCompile Include="libsvn_diff\utf_validate.c">
\r
372 <PrecompiledHeader>NotUsing</PrecompiledHeader>
\r
373 <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
374 <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
\r
376 <ClCompile Include="libsvn_diff\util.c">
\r
377 <PrecompiledHeader>NotUsing</PrecompiledHeader>
\r
378 <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
379 <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
\r
381 <ClCompile Include="libsvn_diff\win32_xlate.c">
\r
382 <PrecompiledHeader>NotUsing</PrecompiledHeader>
\r
383 <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
384 <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
\r
386 <ClCompile Include="libsvn_diff\zip.c">
\r
387 <PrecompiledHeader>NotUsing</PrecompiledHeader>
\r
388 <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
389 <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
\r
391 <ClCompile Include="libsvn_diff\zutil.c">
\r
392 <PrecompiledHeader>NotUsing</PrecompiledHeader>
\r
393 <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
394 <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
\r
398 <ClInclude Include="..\Utils\CommonAppUtils.h" />
\r
399 <ClInclude Include="..\Utils\MiscUI\FileDlgEventHandler.h" />
\r
400 <ClInclude Include="..\Utils\MiscUI\IconMenu.h" />
\r
401 <ClInclude Include="..\Utils\MiscUI\LineColors.h" />
\r
402 <ClInclude Include="..\Utils\MiscUI\StandAloneDlg.h" />
\r
403 <ClInclude Include="..\Utils\MiscUI\TripleClick.h" />
\r
404 <ClInclude Include="..\Utils\ProfilingInfo.h" />
\r
405 <ClInclude Include="..\Utils\TaskbarUUID.h" />
\r
406 <ClInclude Include="Patch.h" />
\r
407 <ClInclude Include="TempFile.h" />
\r
408 <ClInclude Include="AboutDlg.h" />
\r
409 <ClInclude Include="BaseView.h" />
\r
410 <ClInclude Include="BottomView.h" />
\r
411 <ClInclude Include="CustomMFCRibbonButton.h" />
\r
412 <ClInclude Include="DiffColors.h" />
\r
413 <ClInclude Include="DiffData.h" />
\r
414 <ClInclude Include="DiffStates.h" />
\r
415 <ClInclude Include="EOL.h" />
\r
416 <ClInclude Include="FilePatchesDlg.h" />
\r
417 <ClInclude Include="FileTextLines.h" />
\r
418 <ClInclude Include="FindDlg.h" />
\r
419 <ClInclude Include="GotoLineDlg.h" />
\r
420 <ClInclude Include="..\Git\GitPatch.h" />
\r
421 <ClInclude Include="..\Utils\MiscUI\HTMLFormatter.h" />
\r
422 <ClInclude Include="LeftView.h" />
\r
423 <ClInclude Include="LineDiffBar.h" />
\r
424 <ClInclude Include="LocatorBar.h" />
\r
425 <ClInclude Include="MainFrm.h" />
\r
426 <ClInclude Include="MovedBlocks.h" />
\r
427 <ClInclude Include="OpenDlg.h" />
\r
428 <ClInclude Include="..\Utils\MiscUI\SysProgressDlg.h" />
\r
429 <ClInclude Include="resource.h" />
\r
430 <ClInclude Include="RightView.h" />
\r
431 <ClInclude Include="SetColorPage.h" />
\r
432 <ClInclude Include="SetMainPage.h" />
\r
433 <ClInclude Include="Settings.h" />
\r
434 <ClInclude Include="stdafx.h" />
\r
435 <ClInclude Include="..\Gut\GitAdminDir.h" />
\r
436 <ClInclude Include="TortoiseMerge.h" />
\r
437 <ClInclude Include="Undo.h" />
\r
438 <ClInclude Include="ViewData.h" />
\r
439 <ClInclude Include="WorkingFile.h" />
\r
440 <ClInclude Include="AppUtils.h" />
\r
441 <ClInclude Include="..\Utils\MiscUI\BrowseFolder.h" />
\r
442 <ClInclude Include="..\Utils\CmdLineParser.h" />
\r
443 <ClInclude Include="..\Utils\MiscUI\DIB.h" />
\r
444 <ClInclude Include="..\Utils\DirFileEnum.h" />
\r
445 <ClInclude Include="..\Utils\DragDropImpl.h" />
\r
446 <ClInclude Include="..\Utils\MiscUI\FileDropEdit.h" />
\r
447 <ClInclude Include="..\Utils\MiscUI\HistoryCombo.h" />
\r
448 <ClInclude Include="..\Utils\MiscUI\HyperLink.h" />
\r
449 <ClInclude Include="..\Utils\MiscUI\MessageBox.h" />
\r
450 <ClInclude Include="..\Utils\PathUtils.h" />
\r
451 <ClInclude Include="..\Utils\registry.h" />
\r
452 <ClInclude Include="..\Utils\MiscUI\ScrollTool.h" />
\r
453 <ClInclude Include="..\Utils\StringUtils.h" />
\r
454 <ClInclude Include="..\Utils\SysInfo.h" />
\r
455 <ClInclude Include="..\Utils\UnicodeUtils.h" />
\r
456 <ClInclude Include="..\Utils\MiscUI\WaterEffect.h" />
\r
459 <None Include="..\Resources\download.avi" />
\r
460 <None Include="..\Resources\lineadded.ico" />
\r
461 <None Include="..\Resources\lineconflicted.ico" />
\r
462 <None Include="..\Resources\lineconflictedignored.ico" />
\r
463 <None Include="..\Resources\lineedited.ico" />
\r
464 <None Include="..\Resources\LineEndingCR.ico" />
\r
465 <None Include="..\Resources\LineEndingCRLF.ico" />
\r
466 <None Include="..\Resources\LineEndingLF.ico" />
\r
467 <None Include="..\Resources\lineequal.ico" />
\r
468 <None Include="..\Resources\lineremoved.ico" />
\r
469 <None Include="..\Resources\linewhitespace.ico" />
\r
470 <None Include="..\Resources\Margin.cur" />
\r
471 <None Include="..\Resources\moved.ico" />
\r
472 <None Include="..\Resources\ribbon.mfcribbon-ms" />
\r
473 <None Include="..\Resources\ribbon\ribbonlarge.png" />
\r
474 <None Include="..\Resources\ribbon\ribbonsmall.png" />
\r
475 <None Include="..\Resources\ribbon\TortoiseMerge.png" />
\r
476 <None Include="..\Resources\Toolbar.bmp" />
\r
477 <None Include="..\Resources\TortoiseMerge.ico" />
\r
478 <None Include="..\Resources\TortoiseMerge.rc2" />
\r
479 <None Include="..\Resources\tortoisemerge_logoflipped.bmp" />
\r
480 <None Include="..\Resources\tortoisesvn_logoflipped.bmp" />
\r
481 <None Include="..\Resources\ttf_glyph.bmp" />
\r
484 <ResourceCompile Include="..\Resources\TortoiseMergeENG.rc" />
\r
487 <ProjectReference Include="..\..\ext\build\libapr.vcxproj">
\r
488 <Project>{4472028d-4acf-474e-aa95-9b7e12b50f60}</Project>
\r
489 <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
\r
490 </ProjectReference>
\r
491 <ProjectReference Include="..\..\ext\build\libaprutil.vcxproj">
\r
492 <Project>{6bd19bae-4041-4e85-b576-aac9d54caab9}</Project>
\r
493 <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
\r
494 </ProjectReference>
\r
495 <ProjectReference Include="..\..\ext\build\libgit2.vcxproj">
\r
496 <Project>{2b4f366c-93ba-491e-87af-5ef7b37f75f7}</Project>
\r
497 </ProjectReference>
\r
498 <ProjectReference Include="..\..\ext\build\xml.vcxproj">
\r
499 <Project>{ae6aafba-9992-452a-9eb8-dd69402a4ace}</Project>
\r
500 <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
\r
501 </ProjectReference>
\r
502 <ProjectReference Include="..\..\ext\ResizableLib\ResizableLib.vcxproj">
\r
503 <Project>{4be529fb-c2f2-49f7-a897-054b955564cf}</Project>
\r
504 <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
\r
505 </ProjectReference>
\r
506 <ProjectReference Include="..\Git\Git.vcxproj">
\r
507 <Project>{7ca5b1eb-8cc9-40a6-96d8-83649c1a870b}</Project>
\r
508 <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
\r
509 </ProjectReference>
\r
511 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
\r
512 <ImportGroup Label="ExtensionTargets">
\r