Merge branch '0.4.x' into 0.5.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Fri, 4 May 2012 18:55:15 +0000 (18:55 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Fri, 4 May 2012 18:55:15 +0000 (18:55 +0000)
commitb2e5f797b5670c4dc7d0dfd696d21977575fe9ed
tree308157c6a728931ff26a8260e204c633e75ead1d
parent6a89317f621692e7d5c0c67b3a1440bf1b52b328
parentad5a4c7c471912aa0bef52c33a1abfb01fe6d89d
Merge branch '0.4.x' into 0.5.x
src/main.cpp
src/serialize.h
src/util.cpp
src/wallet.h