Merge branch 'master' of https://github.com/bitcoin/bitcoin
authorWladimir J. van der Laan <laanwj@gmail.com>
Thu, 11 Aug 2011 08:17:21 +0000 (10:17 +0200)
committerWladimir J. van der Laan <laanwj@gmail.com>
Thu, 11 Aug 2011 08:17:21 +0000 (10:17 +0200)
commit0a76546ae973241259aa5019e0d27758f86ef891
tree2b2fd48e1a1c18cf4f2d8fb6ad8ccec812779532
parentb0849613bf02b61774b23804c8feed54aa88474a
parentc648b589bec6494551d300b335af88d6b194cf82
Merge branch 'master' of https://github.com/bitcoin/bitcoin
src/main.cpp
src/serialize.h