Merge branch 'patch' of ssh://github.com/svost/novacoin into svost-patch
authorCryptoManiac <balthazar@yandex.ru>
Sat, 5 Mar 2016 17:45:37 +0000 (20:45 +0300)
committerCryptoManiac <balthazar@yandex.ru>
Sat, 5 Mar 2016 17:45:37 +0000 (20:45 +0300)
commit9d14e64825d95061ea0857267646dfcb3d62e07a
tree083de4ff2aa757d1594545c6d173cfb45d467b73
parent46b969fc077d929f6e73266fe7c0b5d1f9b42e18
parent3124bcacd821fc2cd6153e10cbcd8f4fb9cd9f8e
Merge branch 'patch' of ssh://github.com/svost/novacoin into svost-patch
src/key.h
src/main.cpp
src/wallet.cpp