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)
commitbecac4137b43615febe6cef7362d0399cf80aecf
tree230724b7f08dc3c59d30eedfb320ae5c7d164515
parent4e743499196910a3a876cdda09fc872d483b5100
parent9dffb5f4752dbf9d920dbddd7d208c53b57a4219
Merge commit 'origin/master' into temp_rebase

Conflicts:
src/Resources/TortoiseProcENG.rc
src/Resources/TortoiseProcENG.rc
src/TortoiseProc/GitLogListBase.cpp