1 <?xml version="1.0" encoding="utf-8"?>
\r
2 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
\r
4 <Filter Include="Source Files">
\r
5 <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
\r
6 <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
\r
8 <Filter Include="Header Files">
\r
9 <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
\r
10 <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
\r
12 <Filter Include="Resource Files">
\r
13 <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
\r
14 <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
\r
16 <Filter Include="Utils">
\r
17 <UniqueIdentifier>{95777dab-da10-49af-990c-44113399a0bc}</UniqueIdentifier>
\r
19 <Filter Include="Utils\Source Files">
\r
20 <UniqueIdentifier>{56d7b4e7-a4f5-4ab3-9c24-3441aaba4a55}</UniqueIdentifier>
\r
22 <Filter Include="Utils\Header Files">
\r
23 <UniqueIdentifier>{b0d20cec-bc6f-4db4-be33-8c85f80c0950}</UniqueIdentifier>
\r
25 <Filter Include="Libdiff">
\r
26 <UniqueIdentifier>{6963f9fb-04ac-4303-8b76-5b03773aa40e}</UniqueIdentifier>
\r
28 <Filter Include="Git">
\r
29 <UniqueIdentifier>{fb22fec1-7b09-4ab2-8fe2-93e8343bad3d}</UniqueIdentifier>
\r
31 <Filter Include="Git\Header Files">
\r
32 <UniqueIdentifier>{ea35101d-5b37-4be4-8328-1d869be484bc}</UniqueIdentifier>
\r
34 <Filter Include="Git\Source Files">
\r
35 <UniqueIdentifier>{5a81c7c4-96ff-4357-b8b4-683681fa377d}</UniqueIdentifier>
\r
39 <ClCompile Include="AboutDlg.cpp">
\r
40 <Filter>Source Files</Filter>
\r
42 <ClCompile Include="BaseView.cpp">
\r
43 <Filter>Source Files</Filter>
\r
45 <ClCompile Include="BottomView.cpp">
\r
46 <Filter>Source Files</Filter>
\r
48 <ClCompile Include="DiffColors.cpp">
\r
49 <Filter>Source Files</Filter>
\r
51 <ClCompile Include="DiffData.cpp">
\r
52 <Filter>Source Files</Filter>
\r
54 <ClCompile Include="FilePatchesDlg.cpp">
\r
55 <Filter>Source Files</Filter>
\r
57 <ClCompile Include="FileTextLines.cpp">
\r
58 <Filter>Source Files</Filter>
\r
60 <ClCompile Include="FindDlg.cpp">
\r
61 <Filter>Source Files</Filter>
\r
63 <ClCompile Include="LeftView.cpp">
\r
64 <Filter>Source Files</Filter>
\r
66 <ClCompile Include="LineDiffBar.cpp">
\r
67 <Filter>Source Files</Filter>
\r
69 <ClCompile Include="LocatorBar.cpp">
\r
70 <Filter>Source Files</Filter>
\r
72 <ClCompile Include="MainFrm.cpp">
\r
73 <Filter>Source Files</Filter>
\r
75 <ClCompile Include="OpenDlg.cpp">
\r
76 <Filter>Source Files</Filter>
\r
78 <ClCompile Include="RightView.cpp">
\r
79 <Filter>Source Files</Filter>
\r
81 <ClCompile Include="SetColorPage.cpp">
\r
82 <Filter>Source Files</Filter>
\r
84 <ClCompile Include="SetMainPage.cpp">
\r
85 <Filter>Source Files</Filter>
\r
87 <ClCompile Include="Settings.cpp">
\r
88 <Filter>Source Files</Filter>
\r
90 <ClCompile Include="stdafx.cpp">
\r
91 <Filter>Source Files</Filter>
\r
93 <ClCompile Include="TortoiseMerge.cpp">
\r
94 <Filter>Source Files</Filter>
\r
96 <ClCompile Include="Undo.cpp">
\r
97 <Filter>Source Files</Filter>
\r
99 <ClCompile Include="ViewData.cpp">
\r
100 <Filter>Source Files</Filter>
\r
102 <ClCompile Include="WorkingFile.cpp">
\r
103 <Filter>Source Files</Filter>
\r
105 <ClCompile Include="..\Utils\MiscUI\BrowseFolder.cpp">
\r
106 <Filter>Utils\Source Files</Filter>
\r
108 <ClCompile Include="..\Utils\CmdLineParser.cpp">
\r
109 <Filter>Utils\Source Files</Filter>
\r
111 <ClCompile Include="..\Utils\CommonAppUtils.cpp">
\r
112 <Filter>Utils\Source Files</Filter>
\r
114 <ClCompile Include="..\Utils\MiscUI\DIB.cpp">
\r
115 <Filter>Utils\Source Files</Filter>
\r
117 <ClCompile Include="..\Utils\DirFileEnum.cpp">
\r
118 <Filter>Utils\Source Files</Filter>
\r
120 <ClCompile Include="..\Utils\DragDropImpl.cpp">
\r
121 <Filter>Utils\Source Files</Filter>
\r
123 <ClCompile Include="..\Utils\MiscUI\FileDropEdit.cpp">
\r
124 <Filter>Utils\Source Files</Filter>
\r
126 <ClCompile Include="..\Utils\MiscUI\HistoryCombo.cpp">
\r
127 <Filter>Utils\Source Files</Filter>
\r
129 <ClCompile Include="..\Utils\MiscUI\HyperLink.cpp">
\r
130 <Filter>Utils\Source Files</Filter>
\r
132 <ClCompile Include="..\Utils\PathUtils.cpp">
\r
133 <Filter>Utils\Source Files</Filter>
\r
135 <ClCompile Include="..\Utils\Registry.cpp">
\r
136 <Filter>Utils\Source Files</Filter>
\r
138 <ClCompile Include="..\Utils\MiscUI\ScrollTool.cpp">
\r
139 <Filter>Utils\Source Files</Filter>
\r
141 <ClCompile Include="..\Utils\MiscUI\StandAloneDlg.cpp">
\r
142 <Filter>Utils\Source Files</Filter>
\r
144 <ClCompile Include="..\Utils\StringUtils.cpp">
\r
145 <Filter>Utils\Source Files</Filter>
\r
147 <ClCompile Include="..\Utils\SysInfo.cpp">
\r
148 <Filter>Utils\Source Files</Filter>
\r
150 <ClCompile Include="..\Utils\UnicodeUtils.cpp">
\r
151 <Filter>Utils\Source Files</Filter>
\r
153 <ClCompile Include="..\Utils\MiscUI\WaterEffect.cpp">
\r
154 <Filter>Utils\Source Files</Filter>
\r
156 <ClCompile Include="XSplitter.cpp">
\r
157 <Filter>Utils\Source Files</Filter>
\r
159 <ClCompile Include="MovedBlocks.cpp">
\r
160 <Filter>Source Files</Filter>
\r
162 <ClCompile Include="..\Utils\accHelper.cpp">
\r
163 <Filter>Utils\Source Files</Filter>
\r
165 <ClCompile Include="..\Utils\ProfilingInfo.cpp">
\r
166 <Filter>Utils\Source Files</Filter>
\r
168 <ClCompile Include="..\Utils\MiscUI\FileDlgEventHandler.cpp">
\r
169 <Filter>Utils\Source Files</Filter>
\r
171 <ClCompile Include="..\Utils\MiscUI\IconMenu.cpp">
\r
172 <Filter>Utils\Source Files</Filter>
\r
174 <ClCompile Include="..\Utils\TaskbarUUID.cpp">
\r
175 <Filter>Utils\Source Files</Filter>
\r
177 <ClCompile Include="GotoLineDlg.cpp">
\r
178 <Filter>Source Files</Filter>
\r
180 <ClCompile Include="libsvn_diff\adler32.c">
\r
181 <Filter>Libdiff</Filter>
\r
183 <ClCompile Include="libsvn_diff\checksum.c">
\r
184 <Filter>Libdiff</Filter>
\r
186 <ClCompile Include="libsvn_diff\cmdline.c">
\r
187 <Filter>Libdiff</Filter>
\r
189 <ClCompile Include="libsvn_diff\compress.c">
\r
190 <Filter>Libdiff</Filter>
\r
192 <ClCompile Include="libsvn_diff\crc32.c">
\r
193 <Filter>Libdiff</Filter>
\r
195 <ClCompile Include="libsvn_diff\ctype.c">
\r
196 <Filter>Libdiff</Filter>
\r
198 <ClCompile Include="libsvn_diff\deflate.c">
\r
199 <Filter>Libdiff</Filter>
\r
201 <ClCompile Include="libsvn_diff\diff.c">
\r
202 <Filter>Libdiff</Filter>
\r
204 <ClCompile Include="libsvn_diff\diff3.c">
\r
205 <Filter>Libdiff</Filter>
\r
207 <ClCompile Include="libsvn_diff\diff4.c">
\r
208 <Filter>Libdiff</Filter>
\r
210 <ClCompile Include="libsvn_diff\diff_file.c">
\r
211 <Filter>Libdiff</Filter>
\r
213 <ClCompile Include="libsvn_diff\diff_memory.c">
\r
214 <Filter>Libdiff</Filter>
\r
216 <ClCompile Include="libsvn_diff\dirent_uri.c">
\r
217 <Filter>Libdiff</Filter>
\r
219 <ClCompile Include="libsvn_diff\dso.c">
\r
220 <Filter>Libdiff</Filter>
\r
222 <ClCompile Include="libsvn_diff\error.c">
\r
223 <Filter>Libdiff</Filter>
\r
225 <ClCompile Include="libsvn_diff\gzio.c">
\r
226 <Filter>Libdiff</Filter>
\r
228 <ClCompile Include="libsvn_diff\infblock.c">
\r
229 <Filter>Libdiff</Filter>
\r
231 <ClCompile Include="libsvn_diff\infcodes.c">
\r
232 <Filter>Libdiff</Filter>
\r
234 <ClCompile Include="libsvn_diff\inffast.c">
\r
235 <Filter>Libdiff</Filter>
\r
237 <ClCompile Include="libsvn_diff\inflate.c">
\r
238 <Filter>Libdiff</Filter>
\r
240 <ClCompile Include="libsvn_diff\inftrees.c">
\r
241 <Filter>Libdiff</Filter>
\r
243 <ClCompile Include="libsvn_diff\infutil.c">
\r
244 <Filter>Libdiff</Filter>
\r
246 <ClCompile Include="libsvn_diff\io.c">
\r
247 <Filter>Libdiff</Filter>
\r
249 <ClCompile Include="libsvn_diff\lcs.c">
\r
250 <Filter>Libdiff</Filter>
\r
252 <ClCompile Include="libsvn_diff\maketree.c">
\r
253 <Filter>Libdiff</Filter>
\r
255 <ClCompile Include="libsvn_diff\md5.c">
\r
256 <Filter>Libdiff</Filter>
\r
258 <ClCompile Include="libsvn_diff\path.c">
\r
259 <Filter>Libdiff</Filter>
\r
261 <ClCompile Include="libsvn_diff\pool.c">
\r
262 <Filter>Libdiff</Filter>
\r
264 <ClCompile Include="libsvn_diff\sha1.c">
\r
265 <Filter>Libdiff</Filter>
\r
267 <ClCompile Include="libsvn_diff\stream.c">
\r
268 <Filter>Libdiff</Filter>
\r
270 <ClCompile Include="libsvn_diff\svn_string.c">
\r
271 <Filter>Libdiff</Filter>
\r
273 <ClCompile Include="libsvn_diff\SVNLineDiff.cpp">
\r
274 <Filter>Libdiff</Filter>
\r
276 <ClCompile Include="libsvn_diff\token.c">
\r
277 <Filter>Libdiff</Filter>
\r
279 <ClCompile Include="libsvn_diff\trees.c">
\r
280 <Filter>Libdiff</Filter>
\r
282 <ClCompile Include="libsvn_diff\uncompr.c">
\r
283 <Filter>Libdiff</Filter>
\r
285 <ClCompile Include="libsvn_diff\unzip.c">
\r
286 <Filter>Libdiff</Filter>
\r
288 <ClCompile Include="libsvn_diff\utf.c">
\r
289 <Filter>Libdiff</Filter>
\r
291 <ClCompile Include="libsvn_diff\utf_validate.c">
\r
292 <Filter>Libdiff</Filter>
\r
294 <ClCompile Include="libsvn_diff\util.c">
\r
295 <Filter>Libdiff</Filter>
\r
297 <ClCompile Include="libsvn_diff\win32_xlate.c">
\r
298 <Filter>Libdiff</Filter>
\r
300 <ClCompile Include="libsvn_diff\zip.c">
\r
301 <Filter>Libdiff</Filter>
\r
303 <ClCompile Include="libsvn_diff\zutil.c">
\r
304 <Filter>Libdiff</Filter>
\r
306 <ClCompile Include="TempFile.cpp">
\r
307 <Filter>Source Files</Filter>
\r
309 <ClCompile Include="..\Utils\MiscUI\SysProgressDlg.cpp">
\r
310 <Filter>Utils\Source Files</Filter>
\r
312 <ClCompile Include="..\Git\GitAdminDir.cpp">
\r
313 <Filter>Git\Source Files</Filter>
\r
315 <ClCompile Include="..\Git\GitPatch.cpp">
\r
316 <Filter>Git\Source Files</Filter>
\r
318 <ClCompile Include="..\Utils\MiscUI\HTMLFormatter.cpp">
\r
319 <Filter>Utils\Source Files</Filter>
\r
321 <ClCompile Include="..\Utils\MiscUI\MessageBox.cpp">
\r
322 <Filter>Utils\Source Files</Filter>
\r
324 <ClCompile Include="AppUtils.cpp">
\r
325 <Filter>Source Files</Filter>
\r
327 <ClCompile Include="Patch.cpp">
\r
328 <Filter>Source Files</Filter>
\r
332 <ClInclude Include="AboutDlg.h">
\r
333 <Filter>Header Files</Filter>
\r
335 <ClInclude Include="BaseView.h">
\r
336 <Filter>Header Files</Filter>
\r
338 <ClInclude Include="BottomView.h">
\r
339 <Filter>Header Files</Filter>
\r
341 <ClInclude Include="DiffColors.h">
\r
342 <Filter>Header Files</Filter>
\r
344 <ClInclude Include="DiffData.h">
\r
345 <Filter>Header Files</Filter>
\r
347 <ClInclude Include="DiffStates.h">
\r
348 <Filter>Header Files</Filter>
\r
350 <ClInclude Include="EOL.h">
\r
351 <Filter>Header Files</Filter>
\r
353 <ClInclude Include="FilePatchesDlg.h">
\r
354 <Filter>Header Files</Filter>
\r
356 <ClInclude Include="FileTextLines.h">
\r
357 <Filter>Header Files</Filter>
\r
359 <ClInclude Include="FindDlg.h">
\r
360 <Filter>Header Files</Filter>
\r
362 <ClInclude Include="LeftView.h">
\r
363 <Filter>Header Files</Filter>
\r
365 <ClInclude Include="LineDiffBar.h">
\r
366 <Filter>Header Files</Filter>
\r
368 <ClInclude Include="LocatorBar.h">
\r
369 <Filter>Header Files</Filter>
\r
371 <ClInclude Include="MainFrm.h">
\r
372 <Filter>Header Files</Filter>
\r
374 <ClInclude Include="OpenDlg.h">
\r
375 <Filter>Header Files</Filter>
\r
377 <ClInclude Include="resource.h">
\r
378 <Filter>Header Files</Filter>
\r
380 <ClInclude Include="RightView.h">
\r
381 <Filter>Header Files</Filter>
\r
383 <ClInclude Include="SetColorPage.h">
\r
384 <Filter>Header Files</Filter>
\r
386 <ClInclude Include="SetMainPage.h">
\r
387 <Filter>Header Files</Filter>
\r
389 <ClInclude Include="Settings.h">
\r
390 <Filter>Header Files</Filter>
\r
392 <ClInclude Include="stdafx.h">
\r
393 <Filter>Header Files</Filter>
\r
395 <ClInclude Include="TortoiseMerge.h">
\r
396 <Filter>Header Files</Filter>
\r
398 <ClInclude Include="Undo.h">
\r
399 <Filter>Header Files</Filter>
\r
401 <ClInclude Include="ViewData.h">
\r
402 <Filter>Header Files</Filter>
\r
404 <ClInclude Include="WorkingFile.h">
\r
405 <Filter>Header Files</Filter>
\r
407 <ClInclude Include="..\Utils\MiscUI\BrowseFolder.h">
\r
408 <Filter>Utils\Header Files</Filter>
\r
410 <ClInclude Include="..\Utils\CmdLineParser.h">
\r
411 <Filter>Utils\Header Files</Filter>
\r
413 <ClInclude Include="..\Utils\CommonAppUtils.h">
\r
414 <Filter>Utils\Header Files</Filter>
\r
416 <ClInclude Include="..\Utils\MiscUI\DIB.h">
\r
417 <Filter>Utils\Header Files</Filter>
\r
419 <ClInclude Include="..\Utils\DirFileEnum.h">
\r
420 <Filter>Utils\Header Files</Filter>
\r
422 <ClInclude Include="..\Utils\DragDropImpl.h">
\r
423 <Filter>Utils\Header Files</Filter>
\r
425 <ClInclude Include="..\Utils\MiscUI\FileDropEdit.h">
\r
426 <Filter>Utils\Header Files</Filter>
\r
428 <ClInclude Include="..\Utils\MiscUI\HistoryCombo.h">
\r
429 <Filter>Utils\Header Files</Filter>
\r
431 <ClInclude Include="..\Utils\MiscUI\HTMLFormatter.h">
\r
432 <Filter>Utils\Header Files</Filter>
\r
434 <ClInclude Include="..\Utils\MiscUI\HyperLink.h">
\r
435 <Filter>Utils\Header Files</Filter>
\r
437 <ClInclude Include="..\Utils\MiscUI\MessageBox.h">
\r
438 <Filter>Utils\Header Files</Filter>
\r
440 <ClInclude Include="..\Utils\PathUtils.h">
\r
441 <Filter>Utils\Header Files</Filter>
\r
443 <ClInclude Include="..\Utils\registry.h">
\r
444 <Filter>Utils\Header Files</Filter>
\r
446 <ClInclude Include="..\Utils\MiscUI\ScrollTool.h">
\r
447 <Filter>Utils\Header Files</Filter>
\r
449 <ClInclude Include="..\Utils\StringUtils.h">
\r
450 <Filter>Utils\Header Files</Filter>
\r
452 <ClInclude Include="..\Utils\SysInfo.h">
\r
453 <Filter>Utils\Header Files</Filter>
\r
455 <ClInclude Include="..\Utils\UnicodeUtils.h">
\r
456 <Filter>Utils\Header Files</Filter>
\r
458 <ClInclude Include="..\Utils\MiscUI\WaterEffect.h">
\r
459 <Filter>Utils\Header Files</Filter>
\r
461 <ClInclude Include="MovedBlocks.h">
\r
462 <Filter>Header Files</Filter>
\r
464 <ClInclude Include="..\Utils\MiscUI\StandAloneDlg.h">
\r
465 <Filter>Utils\Header Files</Filter>
\r
467 <ClInclude Include="..\Utils\MiscUI\LineColors.h">
\r
468 <Filter>Utils\Header Files</Filter>
\r
470 <ClInclude Include="..\Utils\ProfilingInfo.h">
\r
471 <Filter>Utils\Header Files</Filter>
\r
473 <ClInclude Include="..\Utils\MiscUI\FileDlgEventHandler.h">
\r
474 <Filter>Utils\Header Files</Filter>
\r
476 <ClInclude Include="..\Utils\MiscUI\TripleClick.h">
\r
477 <Filter>Utils\Header Files</Filter>
\r
479 <ClInclude Include="..\Utils\MiscUI\IconMenu.h">
\r
480 <Filter>Utils\Header Files</Filter>
\r
482 <ClInclude Include="..\Utils\TaskbarUUID.h">
\r
483 <Filter>Utils\Header Files</Filter>
\r
485 <ClInclude Include="GotoLineDlg.h">
\r
486 <Filter>Header Files</Filter>
\r
488 <ClInclude Include="TempFile.h">
\r
489 <Filter>Header Files</Filter>
\r
491 <ClInclude Include="..\Gut\GitAdminDir.h">
\r
492 <Filter>Git\Header Files</Filter>
\r
494 <ClInclude Include="..\Git\GitPatch.h">
\r
495 <Filter>Git\Header Files</Filter>
\r
497 <ClInclude Include="..\Utils\MiscUI\SysProgressDlg.h">
\r
498 <Filter>Utils\Header Files</Filter>
\r
500 <ClInclude Include="AppUtils.h">
\r
501 <Filter>Header Files</Filter>
\r
503 <ClInclude Include="Patch.h">
\r
504 <Filter>Header Files</Filter>
\r
506 <ClInclude Include="CustomMFCRibbonButton.h">
\r
507 <Filter>Header Files</Filter>
\r
511 <None Include="..\Resources\download.avi">
\r
512 <Filter>Resource Files</Filter>
\r
514 <None Include="..\Resources\lineadded.ico">
\r
515 <Filter>Resource Files</Filter>
\r
517 <None Include="..\Resources\lineconflicted.ico">
\r
518 <Filter>Resource Files</Filter>
\r
520 <None Include="..\Resources\lineconflictedignored.ico">
\r
521 <Filter>Resource Files</Filter>
\r
523 <None Include="..\Resources\lineedited.ico">
\r
524 <Filter>Resource Files</Filter>
\r
526 <None Include="..\Resources\LineEndingCR.ico">
\r
527 <Filter>Resource Files</Filter>
\r
529 <None Include="..\Resources\LineEndingCRLF.ico">
\r
530 <Filter>Resource Files</Filter>
\r
532 <None Include="..\Resources\LineEndingLF.ico">
\r
533 <Filter>Resource Files</Filter>
\r
535 <None Include="..\Resources\lineequal.ico">
\r
536 <Filter>Resource Files</Filter>
\r
538 <None Include="..\Resources\lineremoved.ico">
\r
539 <Filter>Resource Files</Filter>
\r
541 <None Include="..\Resources\linewhitespace.ico">
\r
542 <Filter>Resource Files</Filter>
\r
544 <None Include="..\Resources\Toolbar.bmp">
\r
545 <Filter>Resource Files</Filter>
\r
547 <None Include="..\Resources\TortoiseMerge.ico">
\r
548 <Filter>Resource Files</Filter>
\r
550 <None Include="..\Resources\TortoiseMerge.rc2">
\r
551 <Filter>Resource Files</Filter>
\r
553 <None Include="..\Resources\tortoisemerge_logoflipped.bmp">
\r
554 <Filter>Resource Files</Filter>
\r
556 <None Include="..\Resources\tortoisesvn_logoflipped.bmp">
\r
557 <Filter>Resource Files</Filter>
\r
559 <None Include="..\Resources\ttf_glyph.bmp">
\r
560 <Filter>Resource Files</Filter>
\r
562 <None Include="..\Resources\moved.ico">
\r
563 <Filter>Resource Files</Filter>
\r
565 <None Include="..\Resources\Margin.cur">
\r
566 <Filter>Resource Files</Filter>
\r
568 <None Include="..\Resources\ribbon.mfcribbon-ms">
\r
569 <Filter>Resource Files</Filter>
\r
571 <None Include="..\Resources\ribbon\TortoiseMerge.png">
\r
572 <Filter>Resource Files</Filter>
\r
574 <None Include="..\Resources\ribbon\ribbonlarge.png">
\r
575 <Filter>Resource Files</Filter>
\r
577 <None Include="..\Resources\ribbon\ribbonsmall.png">
\r
578 <Filter>Resource Files</Filter>
\r
582 <ResourceCompile Include="..\Resources\TortoiseMergeENG.rc">
\r
583 <Filter>Resource Files</Filter>
\r