GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-14 12:43:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 6a135fbe5b into merged_master (Bitcoin PR #15638)

Browse source
This commit is contained in:
Andrew Poelstra 2020-10-28 03:15:23 +00:00
commit a8581ea138
72 changed files with 1317 additions and 1008 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/test/script_tests.cpp
View file

@ -13,7 +13,7 @@
#include <util/system.h>
#include <util/strencodings.h>
#include <test/test_bitcoin.h>
#include <rpc/server.h>
#include <rpc/util.h>
#if defined(HAVE_CONSENSUS_LIB)
#include <script/bitcoinconsensus.h>