Synced with TortoiseMerge
commitc36200fb309df13b17b5c1ca0d49e2414dee0a1f
authorSven Strickroth <email@cs-ware.de>
Wed, 4 Jun 2014 21:20:59 +0000 (4 23:20 +0200)
committerSven Strickroth <email@cs-ware.de>
Thu, 5 Jun 2014 08:47:25 +0000 (5 10:47 +0200)
treebabe9479f18ccdb4aabf2a68f6537a7747e7c640
parented1560e85e433acc25f148f8c322705a2a8f9ec2
Synced with TortoiseMerge

Signed-off-by: Sven Strickroth <email@cs-ware.de>
src/TortoiseMerge/BaseView.cpp