Sync TortoiseIDiff and TortoiseUDiff from TortoiseSVN
commita6234b50b3dbb32636de6ba3a3802f8e06b1d9aa
authorSup Yut Sum <ch3cooli@gmail.com>
Tue, 26 Mar 2013 09:52:27 +0000 (26 17:52 +0800)
committerSup Yut Sum <ch3cooli@gmail.com>
Wed, 27 Mar 2013 12:26:22 +0000 (27 20:26 +0800)
tree4939d752ad0ce39932a2933efc39443e0cd85edf
parent20dc270c6a6e58b0827344ab80094c4a0877dee9
Sync TortoiseIDiff and TortoiseUDiff from TortoiseSVN

Based on TortoiseSVN revision 23757, 23787, 24060, 24061

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
28 files changed:
src/TortoiseIDiff/MainWindow.cpp
src/TortoiseIDiff/TortoiseIDiff.h
src/TortoiseIDiff/TortoiseIDiff.rc
src/TortoiseIDiff/TortoiseIDiff.vcxproj
src/TortoiseIDiff/TortoiseIDiff.vcxproj.filters
src/TortoiseIDiff/resources/TortoiseIDiff.ico [moved from src/TortoiseIDiff/TortoiseIDiff.ico with 100% similarity]
src/TortoiseIDiff/resources/alphatoggle.ico [moved from src/TortoiseIDiff/alphatoggle.ico with 100% similarity]
src/TortoiseIDiff/resources/blend.ico [moved from src/TortoiseIDiff/blend.ico with 100% similarity]
src/TortoiseIDiff/resources/fitinwindow.ico [moved from src/TortoiseIDiff/fitinwindow.ico with 100% similarity]
src/TortoiseIDiff/resources/fittogether.ico [moved from src/TortoiseIDiff/fittogether.ico with 100% similarity]
src/TortoiseIDiff/resources/imginfo.ico [moved from src/TortoiseIDiff/imginfo.ico with 100% similarity]
src/TortoiseIDiff/resources/link.ico [moved from src/TortoiseIDiff/link.ico with 100% similarity]
src/TortoiseIDiff/resources/origsize.ico [moved from src/TortoiseIDiff/origsize.ico with 100% similarity]
src/TortoiseIDiff/resources/overlap.ico [moved from src/TortoiseIDiff/overlap.ico with 100% similarity]
src/TortoiseIDiff/resources/player_fwd.ico [moved from src/TortoiseIDiff/player_fwd.ico with 100% similarity]
src/TortoiseIDiff/resources/player_rew.ico [moved from src/TortoiseIDiff/player_rew.ico with 100% similarity]
src/TortoiseIDiff/resources/player_start.ico [moved from src/TortoiseIDiff/player_start.ico with 100% similarity]
src/TortoiseIDiff/resources/player_stop.ico [moved from src/TortoiseIDiff/player_stop.ico with 100% similarity]
src/TortoiseIDiff/resources/vertical.ico [moved from src/TortoiseIDiff/vertical.ico with 100% similarity]
src/TortoiseIDiff/resources/zoomin.ico [moved from src/TortoiseIDiff/zoomin.ico with 100% similarity]
src/TortoiseIDiff/resources/zoomout.ico [moved from src/TortoiseIDiff/zoomout.ico with 100% similarity]
src/TortoiseUDiff/MainWindow.cpp
src/TortoiseUDiff/TortoiseUDiff.h
src/TortoiseUDiff/TortoiseUDiff.vcxproj
src/TortoiseUDiff/TortoiseUDiff.vcxproj.filters
src/Utils/MiscUI/BaseWindow.cpp
src/Utils/MiscUI/BaseWindow.h
src/Utils/MiscUI/ResString.h [copied from src/TortoiseUDiff/TortoiseUDiff.h with 56% similarity]