Merge branch 'master' of https://github.com/CryptoManiac/NovacoinLibrary
authorCryptoManiac <balthazar.ad@gmail.com>
Mon, 31 Aug 2015 16:27:38 +0000 (19:27 +0300)
committerCryptoManiac <balthazar.ad@gmail.com>
Mon, 31 Aug 2015 16:27:38 +0000 (19:27 +0300)
commit9f2e2cad42a92a3f8d3bf6eff75d49d61fdc7295
treeb7e5871ef46bbc87dec1a7e04e11a5a14097579e
parentbe9d844557911f95165d2c9875c4f5b2822cfc92
parent1f2cbf0bc6a47aaf3bb6b315ad3a3ef73b7d90b4
Merge branch 'master' of https://github.com/CryptoManiac/NovacoinLibrary

Conflicts:
Novacoin/CBlockStore.cs
NovacoinTest/Program.cs