Merge git://github.com/p2k/bitcoin-qt
authorGavin Andresen <gavinandresen@gmail.com>
Thu, 3 Nov 2011 15:06:57 +0000 (11:06 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Thu, 3 Nov 2011 15:06:57 +0000 (11:06 -0400)
commit8c69b6621c6d0a03ddcb9e3c16ebed3af81497e9
tree9f1efceedd9751cbbcb61d0122e897b69dadaadf
parent434a483d50bd02bc225353fa9b301fdbbf4eac7d
parenta8fe4b7a5f012bbfaf99e4566bd73ba0b5107b98
Merge git://github.com/p2k/bitcoin-qt
src/qt/bitcoin.cpp