jl777 3ced93646d Merge remote-tracking branch 'zcash/master' into dev ...

# 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

2017-01-25 09:26:28 +02:00

13 KiB

Raw Blame History

View Raw