Duke Leto ec3f202942 Merge branch 'duke' into dev ...

Conflicts:
	src/chainparams.cpp
    src/primitives/block.h

2019-12-26 20:50:50 -05:00

..

block.cpp

Delete Verus junk, which breaks ARMv8/aarch64 builds

2019-11-04 08:17:27 -05:00

block.h

Merge branch 'duke' into dev

2019-12-26 20:50:50 -05:00

nonce.cpp

update manpages and other junk

2019-11-04 11:01:52 -05:00

nonce.h

Delete Verus junk, which breaks ARMv8/aarch64 builds

2019-11-04 08:17:27 -05:00

transaction.cpp

Update copyright to 2019

2018-12-31 21:41:05 -11:00

transaction.h

Delete Verus junk, which breaks ARMv8/aarch64 builds

2019-11-04 08:17:27 -05:00