OSDN Git Service

Merge from feature_merge branch. Build TortoiseMerge successfully.
authorFrank Li <lznuaa@gmail.com>
Thu, 9 Apr 2009 02:43:13 +0000 (10:43 +0800)
committerFrank Li <lznuaa@gmail.com>
Thu, 9 Apr 2009 02:43:13 +0000 (10:43 +0800)
commit62e1d91d2500c5f7951aab18263d6fad21a2d079
tree9b223f05412923c039188ce82288d8a367e19456
parentb89323272290219c7cf2c49a8ee0f57c1f74c430
parent217ae571dfa36668da71f7022ac7ea51f25fd71f
Merge from feature_merge branch. Build TortoiseMerge successfully.

Signed-off-by: Frank Li <lznuaa@gmail.com>
src/TortoiseGit.sln
src/TortoiseGitBlame/hlp/afx_hidd_filesave.htm