Merge branch '0.5.0.x' into 0.5.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Mon, 16 Apr 2012 01:06:10 +0000 (21:06 -0400)
committerLuke Dashjr <luke-jr+git@utopios.org>
Mon, 16 Apr 2012 01:06:10 +0000 (21:06 -0400)
commite73b792b1af9d9d747bac81a27d16020ed393905
tree9f9b9bfc4f7d14a731182a01edf82aac71cd6cb4
parent9bf1140b90387643ad83e89199e391d002352b22
parent79fc752b6104b796aa5e0a8a8b6d2822fb0f3299
Merge branch '0.5.0.x' into 0.5.x
src/bitcoinrpc.cpp
src/qt/bitcoin.cpp
src/qt/walletmodel.h