Merge Upstream Zcash v1.0.14 as of Jan 22, 2018

z-classic / zclassic

Zclassic is financial freedom. ZK-SNARKs, and no founder's fee.

https://www.reddit.com/r/Zclassic/

Other

189 stars 81 forks source link

Merge Upstream Zcash v1.0.14 as of Jan 22, 2018 #179

Closed ghost closed 5 years ago

nimbosa commented 5 years ago

I have purged README.md and travis.yml commits from the ZclassicDev repo's master branch. All official z-classic repo commits after the original 1.0.14 PR has been re-merged recursively. This is now ready for merge.

nimbosa commented 5 years ago

fixes #164, #165, #171

nimbosa commented 5 years ago

here is the small diff file of the corresponding 1.0.14 versions of Zcash & Zclassic: https://github.com/zcash/zcash/compare/zcash:v1.0.14...z-classic:master.diff

web interface live side by side comparison: https://github.com/zcash/zcash/compare/zcash:v1.0.14...z-classic:master

cc: @heyrhett