Merge branch 'master' of github.com:ignopeverell/grin

This commit is contained in:
Ignotus Peverell 2017-10-17 08:47:48 +00:00
commit ef08140ad7
No known key found for this signature in database
GPG key ID: 99CD25F39F8F8211

View file

@ -18,7 +18,7 @@ grin_util = { path = "../util" }
[dependencies.cuckoo_miner] [dependencies.cuckoo_miner]
git = "https://github.com/mimblewimble/cuckoo-miner" git = "https://github.com/mimblewimble/cuckoo-miner"
tag="barrier_test" tag="grin_integration_14"
#path = "../../cuckoo-miner" #path = "../../cuckoo-miner"
#uncomment this feature to turn off plugin builds #uncomment this feature to turn off plugin builds
#features=["no-plugin-build"] #features=["no-plugin-build"]