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)
1  2 
src/main.h

diff --cc src/main.h
Simple merge