Merge branch 'master' of https://github.com/laanwj/bitcoin-qt
authorCelil <celil.kj@gmail.com>
Mon, 18 Jul 2011 22:45:55 +0000 (15:45 -0700)
committerCelil <celil.kj@gmail.com>
Mon, 18 Jul 2011 22:45:55 +0000 (15:45 -0700)
1  2 
bitcoin-qt.pro

diff --cc bitcoin-qt.pro
Simple merge