mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-16 13:01:19 +02:00
Merge 78295e97b8 into merged_master (Bitcoin PR #15788)
This commit is contained in:
commit
161bcd2ae8
98 changed files with 322 additions and 302 deletions
|
|
@ -1,4 +1,4 @@
|
|||
// Copyright (c) 2011-2018 The Bitcoin Core developers
|
||||
// Copyright (c) 2011-2019 The Bitcoin Core developers
|
||||
// Distributed under the MIT software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
#include <random.h>
|
||||
#include <script/standard.h>
|
||||
#include <script/sign.h>
|
||||
#include <test/test_bitcoin.h>
|
||||
#include <test/setup_common.h>
|
||||
#include <util/time.h>
|
||||
#include <core_io.h>
|
||||
#include <keystore.h>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue