OSDN Git Service

SyncDlg Show Conflict when pull
authorFrank Li <lznuaa@gmail.com>
Sat, 25 Jul 2009 06:01:01 +0000 (14:01 +0800)
committerFrank Li <lznuaa@gmail.com>
Sat, 25 Jul 2009 06:01:01 +0000 (14:01 +0800)
commit4a2d5a5fede71c585db9614d2d07a7d6ce62317c
treee8a68019d20064c18ccd466129ac09076bf5caaf
parent2c1733408908f7e485e5025e153ac310b76392c1
SyncDlg Show Conflict when pull

Signed-off-by: Frank Li <lznuaa@gmail.com>
src/Resources/TortoiseProcENG.rc
src/TortoiseProc/SyncDlg.cpp
src/TortoiseProc/SyncDlg.h
src/TortoiseProc/resource.h