Merge remote-tracking branch 'remotes/origin/newminer'
authorCryptoManiac <balthazar@yandex.ru>
Fri, 24 Apr 2015 20:22:03 +0000 (13:22 -0700)
committerCryptoManiac <balthazar@yandex.ru>
Fri, 24 Apr 2015 20:22:03 +0000 (13:22 -0700)
commit9417ff30cae6ffffd1c4fc4f4b1a81551f04dbc5
tree9f06797fc6059b04c23b42f8320917363c9f6386
parent68938e65fd9e607b8822db4edb76731c1edfe85c
parentc82230b0f0a00f1ce5d81f0750b60e2bbbca1deb
Merge remote-tracking branch 'remotes/origin/newminer'
src/kernel.cpp
src/main.cpp
src/rpcwallet.cpp
src/wallet.cpp