Merge branch '0.5.0.x' into 0.5.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Fri, 16 Mar 2012 20:45:32 +0000 (16:45 -0400)
committerLuke Dashjr <luke-jr+git@utopios.org>
Fri, 16 Mar 2012 20:45:32 +0000 (16:45 -0400)
Conflicts:
bitcoin-qt.pro
doc/README
doc/README_windows.txt
share/setup.nsi
src/serialize.h

1  2 
bitcoin-qt.pro
src/bitcoinrpc.cpp
src/qt/guiutil.h

diff --cc bitcoin-qt.pro
Simple merge
Simple merge
Simple merge