OSDN Git Service

Merge commit 'origin/master' into temp_rebase
authorJohan 't Hart <johanthart@gmail.com>
Tue, 16 Jun 2009 21:55:06 +0000 (23:55 +0200)
committerJohan 't Hart <johanthart@gmail.com>
Tue, 16 Jun 2009 21:55:06 +0000 (23:55 +0200)
Conflicts:
src/Resources/TortoiseProcENG.rc

1  2 
src/Resources/TortoiseProcENG.rc
src/TortoiseProc/GitLogListBase.cpp

index aadb3b4,2a6dc84..f5ecb8e
Binary files differ
Simple merge