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 7400135b79 into merged_master (Bitcoin PR #16278)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-09 03:58:17 +00:00
commit 9274da2dfc
52 changed files with 46 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/test/script_tests.cpp
View file

@ -14,12 +14,12 @@
#include <util/strencodings.h>
#include <test/setup_common.h>
#include <rpc/util.h>
#include <streams.h>
#if defined(HAVE_CONSENSUS_LIB)
#include <script/bitcoinconsensus.h>
#endif
#include <fstream>
#include <stdint.h>
#include <string>
#include <vector>