Merge branch 'master' of github.com:novacoin-project/novacoin
authorMASM fan <masmfan@gmail.com>
Thu, 27 Nov 2014 23:30:17 +0000 (03:30 +0400)
committerMASM fan <masmfan@gmail.com>
Thu, 27 Nov 2014 23:30:17 +0000 (03:30 +0400)
commitb50899ee42edc8aef21bf8965c293e74fd9e5f80
treef69c5adf75a3aa2e41b00195b2ac3cfe8a37beaf
parent92c2fcee5ae00e4c0ab2d5a064bf70cdb4699ede
parentbd5d360b11efa6e66b068113f7e9f134cbb715e4
Merge branch 'master' of github.com:novacoin-project/novacoin
src/qt/bitcoingui.cpp
src/wallet.cpp