Merge branch 'master' of https://github.com/bitcoin/bitcoin
authorWladimir J. van der Laan <laanwj@gmail.com>
Mon, 22 Aug 2011 12:43:37 +0000 (14:43 +0200)
committerWladimir J. van der Laan <laanwj@gmail.com>
Mon, 22 Aug 2011 12:43:37 +0000 (14:43 +0200)
commitadce862c2795142a5f56933584abffdbe3599472
treed181162faf9da3ed5c480983aab3a363784e7589
parent872b1f3e4c15de16fd821ab0adde9697a9e8d925
parent865ed8a1e5c587468a40756d46bcbc1c5a12bb06
Merge branch 'master' of https://github.com/bitcoin/bitcoin
src/main.cpp
src/util.cpp
src/util.h