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)
1  2 
src/qt/bitcoingui.cpp
src/wallet.cpp

Simple merge
diff --cc src/wallet.cpp
Simple merge