added GPL header
commit0b05b71ae50aed5c081df08eb98170b36b7c1ba6
authorSven Strickroth <email@cs-ware.de>
Tue, 6 Dec 2011 19:49:14 +0000 (6 20:49 +0100)
committerSven Strickroth <email@cs-ware.de>
Tue, 6 Dec 2011 19:49:14 +0000 (6 20:49 +0100)
tree99deedc976bf0ffffc7898ef9195c922d979c96a
parent2311f634c1c3bc644cdd43b07fa01663cd2a5a82
added GPL header

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