Merge the "Diff Viewer" and "Unified Diff Viewer" settings pages into one page.
commita5744dc13975d404a51251dd13e2f8621b63d7e2
authorSven Strickroth <email@cs-ware.de>
Thu, 29 Dec 2011 20:22:16 +0000 (29 21:22 +0100)
committerSven Strickroth <email@cs-ware.de>
Thu, 29 Dec 2011 20:25:09 +0000 (29 21:25 +0100)
tree55cdd9701e4a1d7d0a78d8df90906dda5f03e7b2
parent8e2bbbc41a4b9d22843439bcf0b9b819926a588a
Merge the "Diff Viewer" and "Unified Diff Viewer" settings pages into one page.

based on TortoiseSVN r22361

Signed-off-by: Sven Strickroth <email@cs-ware.de>
src/Resources/TortoiseProcENG.rc
src/TortoiseProc/Settings/Settings.cpp
src/TortoiseProc/Settings/Settings.h
src/TortoiseProc/Settings/SettingsProgsDiff.cpp
src/TortoiseProc/Settings/SettingsProgsDiff.h
src/TortoiseProc/Settings/SettingsProgsUniDiff.cpp [deleted file]
src/TortoiseProc/Settings/SettingsProgsUniDiff.h [deleted file]
src/TortoiseProc/TortoiseProc.vcproj
src/TortoiseProc/resource.h