Commit Graph

4 Commits

Author SHA1 Message Date
jl777
bc17ac4928 Merge remote-tracking branch 'zcash/master' into rebase
# Conflicts:
#	README.md
#	src/Makefile.gtest.include
#	src/chainparams.cpp
#	src/init.cpp
#	src/miner.cpp
#	src/wallet/wallet.cpp
2016-12-12 12:19:13 +02:00
Jack Grigg
548bbd95f0 Adjust consensus rule to accept genesis block without height in coinbase
Closes #1753
2016-11-01 19:58:56 -05:00
jl777
21de2ee1e4 test 2016-10-28 14:42:43 -03:00
Jack Grigg
80f4cdcf8f Reject block versions lower than 4
Closes #1556
2016-10-22 00:43:26 -05:00