Took all code from TortoiseMerge and made it compile again
commit6db9a048985ef7a58950fc4530c7b0e7ac998fd6
authorSven Strickroth <email@cs-ware.de>
Sat, 29 Dec 2012 00:26:47 +0000 (29 01:26 +0100)
committerSven Strickroth <email@cs-ware.de>
Sun, 30 Dec 2012 23:37:21 +0000 (31 00:37 +0100)
treea05a912edcaa491ae15cf656a60ef49c3eb0eeff
parentf9e1cac82c182e0827952d3a5369125f0b8a9aaa
Took all code from TortoiseMerge and made it compile again

Based on TortoiseSVN revision 23767, but not dropped TGit patches which applied cleanly.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
128 files changed:
src/Git/GitPatch.cpp [new file with mode: 0644]
src/Git/GitPatch.h [new file with mode: 0644]
src/Resources/Margin.cur [new file with mode: 0644]
src/Resources/TortoiseMerge.rc2
src/Resources/TortoiseMergeENG.rc
src/Resources/moved.ico [new file with mode: 0644]
src/Resources/ribbon.mfcribbon-ms [new file with mode: 0644]
src/Resources/ribbon/About.png [new file with mode: 0644]
src/Resources/ribbon/Check.png [new file with mode: 0644]
src/Resources/ribbon/Collapse.png [new file with mode: 0644]
src/Resources/ribbon/Copy.png [new file with mode: 0644]
src/Resources/ribbon/DownGreen.png [new file with mode: 0644]
src/Resources/ribbon/DownGreenDots.png [new file with mode: 0644]
src/Resources/ribbon/DownRed.png [new file with mode: 0644]
src/Resources/ribbon/Exit.png [new file with mode: 0644]
src/Resources/ribbon/FileList.png [new file with mode: 0644]
src/Resources/ribbon/Goto.png [new file with mode: 0644]
src/Resources/ribbon/Help.png [new file with mode: 0644]
src/Resources/ribbon/InlineDiff.png [new file with mode: 0644]
src/Resources/ribbon/InlineDiffWord.png [new file with mode: 0644]
src/Resources/ribbon/LeftGreen.png [new file with mode: 0644]
src/Resources/ribbon/LeftGreenDots.png [new file with mode: 0644]
src/Resources/ribbon/LeftRed.png [new file with mode: 0644]
src/Resources/ribbon/OneWayDiff.png [new file with mode: 0644]
src/Resources/ribbon/Open.png [new file with mode: 0644]
src/Resources/ribbon/OrangeDotDown.png [new file with mode: 0644]
src/Resources/ribbon/OrangeDotLeft.png [new file with mode: 0644]
src/Resources/ribbon/OrangeDotRight.png [new file with mode: 0644]
src/Resources/ribbon/OrangeDotUp.png [new file with mode: 0644]
src/Resources/ribbon/Paste.png [new file with mode: 0644]
src/Resources/ribbon/Pilcrow.png [new file with mode: 0644]
src/Resources/ribbon/Refresh.png [new file with mode: 0644]
src/Resources/ribbon/RightGreen.png [new file with mode: 0644]
src/Resources/ribbon/RightGreenDots.png [new file with mode: 0644]
src/Resources/ribbon/RightRed.png [new file with mode: 0644]
src/Resources/ribbon/Save.png [new file with mode: 0644]
src/Resources/ribbon/SaveAs.png [new file with mode: 0644]
src/Resources/ribbon/Search.png [new file with mode: 0644]
src/Resources/ribbon/Settings.png [new file with mode: 0644]
src/Resources/ribbon/Switch.png [new file with mode: 0644]
src/Resources/ribbon/TortoiseMerge.png [new file with mode: 0644]
src/Resources/ribbon/Undo.png [new file with mode: 0644]
src/Resources/ribbon/UniDiff.png [new file with mode: 0644]
src/Resources/ribbon/UpGreen.png [new file with mode: 0644]
src/Resources/ribbon/UpGreenDots.png [new file with mode: 0644]
src/Resources/ribbon/UpRed.png [new file with mode: 0644]
src/Resources/ribbon/WhiteSpace1.png [new file with mode: 0644]
src/Resources/ribbon/WhiteSpace2.png [new file with mode: 0644]
src/Resources/ribbon/WhiteSpace3.png [new file with mode: 0644]
src/Resources/ribbon/WrapLines.png [new file with mode: 0644]
src/Resources/ribbon/createribbonimglist.bat [new file with mode: 0644]
src/Resources/ribbon/ribbonimagelist.txt [new file with mode: 0644]
src/Resources/ribbon/ribbonlarge.png [new file with mode: 0644]
src/Resources/ribbon/ribbonsmall.png [new file with mode: 0644]
src/TortoiseGitBlame/TortoiseGitBlameView.cpp
src/TortoiseMerge/AboutDlg.cpp
src/TortoiseMerge/AboutDlg.h
src/TortoiseMerge/AppUtils.cpp
src/TortoiseMerge/AppUtils.h
src/TortoiseMerge/BaseView.cpp
src/TortoiseMerge/BaseView.h
src/TortoiseMerge/BottomView.cpp
src/TortoiseMerge/BottomView.h
src/TortoiseMerge/DiffColors.cpp
src/TortoiseMerge/DiffColors.h
src/TortoiseMerge/DiffData.cpp
src/TortoiseMerge/DiffData.h
src/TortoiseMerge/DiffStates.h
src/TortoiseMerge/EOL.h
src/TortoiseMerge/EditGotoDlg.cpp [deleted file]
src/TortoiseMerge/FilePatchesDlg.cpp
src/TortoiseMerge/FilePatchesDlg.h
src/TortoiseMerge/FileTextLines.cpp
src/TortoiseMerge/FileTextLines.h
src/TortoiseMerge/FindDlg.cpp
src/TortoiseMerge/FindDlg.h
src/TortoiseMerge/GotoLineDlg.cpp [new file with mode: 0644]
src/TortoiseMerge/GotoLineDlg.h [copied from src/TortoiseMerge/EditGotoDlg.h with 54% similarity]
src/TortoiseMerge/LeftView.cpp
src/TortoiseMerge/LeftView.h
src/TortoiseMerge/LineDiffBar.cpp
src/TortoiseMerge/LineDiffBar.h
src/TortoiseMerge/LocatorBar.cpp
src/TortoiseMerge/LocatorBar.h
src/TortoiseMerge/MainFrm.cpp
src/TortoiseMerge/MainFrm.h
src/TortoiseMerge/MovedBlocks.cpp [new file with mode: 0644]
src/TortoiseMerge/MovedBlocks.h [moved from src/TortoiseMerge/TempFiles.h with 65% similarity]
src/TortoiseMerge/OpenDlg.cpp
src/TortoiseMerge/OpenDlg.h
src/TortoiseMerge/Patch.cpp
src/TortoiseMerge/Patch.h
src/TortoiseMerge/RightView.cpp
src/TortoiseMerge/RightView.h
src/TortoiseMerge/SetColorPage.cpp
src/TortoiseMerge/SetColorPage.h
src/TortoiseMerge/SetMainPage.cpp
src/TortoiseMerge/SetMainPage.h
src/TortoiseMerge/Settings.cpp
src/TortoiseMerge/Settings.h
src/TortoiseMerge/TempFile.cpp [new file with mode: 0644]
src/TortoiseMerge/TempFile.h [new file with mode: 0644]
src/TortoiseMerge/TempFiles.cpp [deleted file]
src/TortoiseMerge/TortoiseMerge.cpp
src/TortoiseMerge/TortoiseMerge.h
src/TortoiseMerge/TortoiseMerge.vcproj [deleted file]
src/TortoiseMerge/TortoiseMerge.vcxproj
src/TortoiseMerge/TortoiseMerge.vcxproj.filters
src/TortoiseMerge/TortoiseMergeLang.vcproj [deleted file]
src/TortoiseMerge/TortoiseMergeLang.vcxproj.filters
src/TortoiseMerge/Undo.cpp
src/TortoiseMerge/Undo.h
src/TortoiseMerge/ViewData.cpp
src/TortoiseMerge/ViewData.h
src/TortoiseMerge/WorkingFile.cpp
src/TortoiseMerge/WorkingFile.h
src/TortoiseMerge/XSplitter.cpp
src/TortoiseMerge/XSplitter.h
src/TortoiseMerge/libsvn_diff/SVNLineDiff.cpp
src/TortoiseMerge/resource.h
src/TortoiseMerge/stdafx.h
src/TortoiseMerge/svninclude/SVNLineDiff.h
src/Utils/MiscUI/FileDlgEventHandler.cpp [new file with mode: 0644]
src/Utils/MiscUI/FileDlgEventHandler.h [new file with mode: 0644]
src/Utils/MiscUI/LineColors.h [new file with mode: 0644]
src/Utils/MiscUI/TripleClick.h [new file with mode: 0644]
src/Utils/SelectFileFilter.h [new file with mode: 0644]
src/Utils/accHelper.cpp [moved from src/TortoiseMerge/EditGotoDlg.h with 62% similarity]