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

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

Browse Source 
# Conflicts:
#	README.md
#	src/Makefile.gtest.include
#	src/chainparams.cpp
#	src/init.cpp
#	src/miner.cpp
#	src/wallet/wallet.cpp
This commit is contained in:
jl777
2016-12-12 12:19:13 +02:00
parent 132aea8c60 9f7bc6cba5
commit bc17ac4928
94 changed files with 3461 additions and 808 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -65,6 +65,7 @@ src/qt/test/moc*.cpp
*.a
*.pb.cc
*.pb.h
.vscode
*.log
*.trs