Fixed issue #2546: Location bar in TortoiseGitMerge missing
commitc85c204c19f07f74b3795b5881e73ff2d07d2450
authorSven Strickroth <email@cs-ware.de>
Fri, 31 Jul 2015 18:28:27 +0000 (31 20:28 +0200)
committerSven Strickroth <email@cs-ware.de>
Fri, 31 Jul 2015 20:03:13 +0000 (31 22:03 +0200)
treeb0b7ade2dd13ce2e6f8d9610ed528fed48cbbec4
parent7198f294cdd7a49ca77882cc77b1ac0c740b7fde
Fixed issue #2546: Location bar in TortoiseGitMerge missing

Based on TortoiseSVN revision 26634.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
src/Changelog.txt
src/TortoiseMerge/LocatorBar.cpp
src/TortoiseMerge/LocatorBar.h