Merge branch '0.4.x' into 0.5.0.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Tue, 17 Jan 2012 03:27:59 +0000 (22:27 -0500)
committerLuke Dashjr <luke-jr+git@utopios.org>
Tue, 17 Jan 2012 03:27:59 +0000 (22:27 -0500)
commit70550ed81be022c81826791a75dd1567db1d667b
tree88769f755450ae90c483066574ef572397c6f846
parent5df96269d30ec57e69676e6937b45b3608df98ac
parent948072c39f913d1ebe43b3b46234f9d7a0d00427
Merge branch '0.4.x' into 0.5.0.x
src/headers.h
src/net.cpp
src/net.h
src/serialize.h
src/wallet.h