Fixed issue #221: After resolving all merge conflicts, it's not obvious the project...
commit2b71d04ec90bbbf04f0bd87b39df0ae06adc89d4
authorFrank Li <lznuaa@gmail.com>
Sun, 23 May 2010 07:30:01 +0000 (23 15:30 +0800)
committerFrank Li <lznuaa@gmail.com>
Sun, 23 May 2010 07:30:01 +0000 (23 15:30 +0800)
tree400447e08bcfb096808315eb4f3fb6b9a96d93f4
parent288d54aa494444016247b793537bdfcd4d6c1019
Fixed issue #221: After resolving all merge conflicts, it's not obvious the project needs a commit

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