Merge branch 'master' of github.com:novacoin-project/novacoin
authorCryptoManiac <balthazar@yandex.ru>
Thu, 31 Mar 2016 17:18:38 +0000 (20:18 +0300)
committerCryptoManiac <balthazar@yandex.ru>
Thu, 31 Mar 2016 17:18:38 +0000 (20:18 +0300)
commit27ce22da0815f4c1fa0e949cc4740e3f4dd1ea9c
tree12b7c493f8d5b457d06af6393b930fe65dd86157
parenteff2e08302c3c084983f045038bc1708dc6b570a
parentc95d66bd55a225326e81dce15d347f04b1d71d67
Merge branch 'master' of github.com:novacoin-project/novacoin
src/main.h