Merge branch 'display-version-in-help' of https://github.com/mhanne/bitcoin
authorChris Moore <dooglus@gmail.com>
Fri, 21 Jan 2011 20:09:32 +0000 (12:09 -0800)
committerChris Moore <dooglus@gmail.com>
Fri, 21 Jan 2011 20:09:32 +0000 (12:09 -0800)
commit18cb92ab184d0864af3fd9ff6423536333820c3b
treea235bd682b42d40f44fe5dd73e8ff475d1da40c4
parent86c0af514b59971f7a5c3876898165667cbbeb6b
parent0654e1c4ef472c90fa6575af5222a5953d4cf55b
Merge branch 'display-version-in-help' of https://github.com/mhanne/bitcoin
init.cpp