Major updates integration from all upstreams

This commit is contained in:
miketout
2018-09-18 14:33:53 -07:00
396 changed files with 25517 additions and 6854 deletions

4
.gitignore vendored
View File

@@ -7,10 +7,6 @@ src/zcash-gtest
src/zcash-tx
src/test/test_bitcoin
# Zcash utilities
src/zcash/GenerateParams
src/zcash/CreateJoinSplit
*zcashTest.pk
*zcashTest.vk