Merge branch 'master' of https://github.com/CryptoManiac/NovacoinLibrary
authorCryptoManiac <balthazar@yandex.ru>
Sun, 30 Aug 2015 17:42:00 +0000 (20:42 +0300)
committerCryptoManiac <balthazar@yandex.ru>
Sun, 30 Aug 2015 17:42:00 +0000 (20:42 +0300)
commit5aac8795a5ce227a2f9340f7cdf9746f781101f6
tree1f0767007b8e21d9f9acd6279f7393ca08e31b48
parent5c9959adf8c0173dce35d97042f1b93d593fee0d
parente817cfa60d6a7d7d724e6cd3ec3a04239aae1ac2
Merge branch 'master' of https://github.com/CryptoManiac/NovacoinLibrary

Conflicts:
Novacoin/CTransaction.cs