Merge branch 'master' of https://github.com/bitcoin/bitcoin
authorWladimir J. van der Laan <laanwj@gmail.com>
Sun, 9 Oct 2011 18:26:40 +0000 (20:26 +0200)
committerWladimir J. van der Laan <laanwj@gmail.com>
Sun, 9 Oct 2011 18:26:40 +0000 (20:26 +0200)
1  2 
bitcoin-qt.pro

diff --cc bitcoin-qt.pro
Simple merge