diff options
| author | Jeff Garzik <jgarzik@bitpay.com> | 2014-08-01 06:18:58 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@bitpay.com> | 2014-08-01 06:18:58 -0400 |
| commit | de89257fc516a68c89da0c70858c9c2b86a701f7 (patch) | |
| tree | 9a046952adfb50ce37e3ab290adfb1c16e30ea82 /src | |
| parent | 9fcb410195935edf75bbeccaeb8a37ae4d3e5a4e (diff) | |
| parent | 2b600992e8de0cc9a484e3bf25fe71ac50adadb7 (diff) | |
Merge branch 'merge-rawtx2' into merge-rawtx3
Diffstat (limited to 'src')
| -rw-r--r-- | src/core_io.h | 5 | ||||
| -rw-r--r-- | src/core_read.cpp | 4 | ||||
| -rw-r--r-- | src/core_write.cpp | 4 |
3 files changed, 11 insertions, 2 deletions
diff --git a/src/core_io.h b/src/core_io.h index 8a7d580570..adf74cce32 100644 --- a/src/core_io.h +++ b/src/core_io.h @@ -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; diff --git a/src/core_read.cpp b/src/core_read.cpp index 0f06bb6952..593eb2d035 100644 --- a/src/core_read.cpp +++ b/src/core_read.cpp @@ -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" diff --git a/src/core_write.cpp b/src/core_write.cpp index 2eb220779f..37dd69f7b8 100644 --- a/src/core_write.cpp +++ b/src/core_write.cpp @@ -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" |