mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-14 12:43:40 +02:00
Merge cb8844e2b9 into merged_master (Bitcoin PR bitcoin/bitcoin#28728)
This commit is contained in:
commit
f0aca27969
8 changed files with 40 additions and 24 deletions
|
|
@ -1,11 +1,14 @@
|
|||
// Copyright (c) 2009-2010 Satoshi Nakamoto
|
||||
// Copyright (c) 2009-2021 The Bitcoin Core developers
|
||||
// Copyright (c) 2009-present The Bitcoin Core developers
|
||||
// Distributed under the MIT software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
#include <script/script.h>
|
||||
|
||||
#include <crypto/common.h>
|
||||
#include <hash.h>
|
||||
#include <uint256.h>
|
||||
#include <util/hash_type.h>
|
||||
#include <util/strencodings.h>
|
||||
|
||||
#include <string>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue