Show filename in DeleteConflictDlg and fix optics
commitf4f112fe8de1fe1e9037438defe9d891294a1bf0
authorSven Strickroth <email@cs-ware.de>
Fri, 21 Nov 2014 18:49:13 +0000 (21 19:49 +0100)
committerSven Strickroth <email@cs-ware.de>
Fri, 21 Nov 2014 18:49:13 +0000 (21 19:49 +0100)
tree04383920da31ec850858d2e7a90ecd27c2456089
parent871fa9aef25b48ea0d1756aa897298cf34726acd
Show filename in DeleteConflictDlg and fix optics

Signed-off-by: Sven Strickroth <email@cs-ware.de>
src/Resources/TortoiseProcENG.rc
src/TortoiseProc/DeleteConflictDlg.cpp