mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-01-26 03:03:22 -03:00
Merge branch 'merge-rawtx2' into merge-rawtx3
This commit is contained in:
commit
de89257fc5
3 changed files with 11 additions and 2 deletions
|
@ -1,7 +1,12 @@
|
|||
// Copyright (c) 2009-2014 The Bitcoin developers
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
#ifndef __BITCOIN_CORE_IO_H__
|
||||
#define __BITCOIN_CORE_IO_H__
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
class uint256;
|
||||
class CScript;
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
// Copyright (c) 2009-2014 The Bitcoin developers
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
#include <vector>
|
||||
#include "core_io.h"
|
||||
#include "core.h"
|
||||
#include "serialize.h"
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
// Copyright (c) 2009-2014 The Bitcoin developers
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
#include <vector>
|
||||
#include "core_io.h"
|
||||
#include "univalue/univalue.h"
|
||||
#include "script.h"
|
||||
|
|
Loading…
Add table
Reference in a new issue