Merge branch 'master' of https://github.com/bitcoin/bitcoin
authorWladimir J. van der Laan <laanwj@gmail.com>
Sat, 3 Sep 2011 07:09:34 +0000 (09:09 +0200)
committerWladimir J. van der Laan <laanwj@gmail.com>
Sat, 3 Sep 2011 07:09:34 +0000 (09:09 +0200)
commit0a70a3f4d88ad8e4ab689bacff4eda0cdfa88e65
tree57a05ca259341308e9f97404d4941d1319714585
parent0aca8577b55d218f72c7383b2464ca07b7f77d0d
parent7464e647decace52bc075d9ac8788974504e0bb9
Merge branch 'master' of https://github.com/bitcoin/bitcoin
src/main.cpp
src/serialize.h
src/util.cpp