DragonX/hush3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'zcash/master' into dev

Browse Source 
# Conflicts:
#	.gitignore
#	README.md
#	src/Makefile.gtest.include
#	src/gtest/test_checkblock.cpp
#	src/init.cpp
#	src/main.cpp
#	src/main.h
#	src/rpcserver.cpp
#	src/test/checkblock_tests.cpp
#	src/util.cpp
This commit is contained in:
jl777
2017-01-25 09:26:28 +02:00
parent 174cae4128 ee6d993561
commit 3ced93646d
80 changed files with 1225 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -11,6 +11,7 @@ src/qt/test/test_bitcoin-qt
# Zcash utilities
src/zcash/GenerateParams
src/zcash/CreateJoinSplit
*zcashTest.pk
*zcashTest.vk
@@ -124,3 +125,5 @@ qa/pull-tester/test.*/*
libzcashconsensus.pc
src/fiat/-usd
contrib/debian/files
contrib/debian/substvars