Merge branch 'master' of github.com:novacoin-project/novacoin
authorCryptoManiac <balthazar@yandex.ru>
Tue, 29 Mar 2016 01:23:11 +0000 (04:23 +0300)
committerCryptoManiac <balthazar@yandex.ru>
Tue, 29 Mar 2016 01:23:11 +0000 (04:23 +0300)
commit34694c603fa90378d59d70804a5862df3845b2b8
tree0d99fa31c0b9872a6680b8057b1076410f4c2fdb
parent9e58e0a8ca28b15a4bfa677f5b23891972db40fd
parent1c1980bccd1bcccdb03c69ebbe03ad51e08f343a
Merge branch 'master' of github.com:novacoin-project/novacoin
src/bitcoinrpc.cpp
src/main.cpp
src/rpcwallet.cpp
src/wallet.cpp