Merge branch '0.5.0.x' into 0.5.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Sat, 3 Mar 2012 18:59:31 +0000 (13:59 -0500)
committerLuke Dashjr <luke-jr+git@utopios.org>
Sat, 3 Mar 2012 18:59:31 +0000 (13:59 -0500)
commit9cf600e6dabe9133a0c25e87babc42e3a0e1a29a
treeb81f7aff9d930cd4baede522cfc713c8467db364
parent6fb186f4bbeb34b4e5c22f909e8d0a1a877f1c44
parent7013cc3d9710c0a03f6587c854e4e50c358ea70c
Merge branch '0.5.0.x' into 0.5.x
src/bitcoinrpc.cpp
src/qt/bitcoin.cpp
src/qt/guiutil.h
src/qt/sendcoinsdialog.h