diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-04-26 14:33:12 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-04-26 14:42:09 +0200 |
| commit | 1d9d314573ee48f6f51107265f1cf1fa9e36c998 (patch) | |
| tree | 6c1946ec948bf2dbd9f4bc1bf37bfe14d79808f3 /src/bitcoin-tx.cpp | |
| parent | 1623f6e3375430b42e7120dc02e8df8c7c22fc16 (diff) | |
| parent | 691161d419fe3d82d7a49b511ef80e2b24332aac (diff) | |
| download | bitcoin-1d9d314573ee48f6f51107265f1cf1fa9e36c998.tar.xz | |
Merge pull request #5696
691161d Consensus: Create consensus/consensus.h with some constants (jtimon)
Diffstat (limited to 'src/bitcoin-tx.cpp')
| -rw-r--r-- | src/bitcoin-tx.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp index 78f5c2c4b6..f1c1c0ff8b 100644 --- a/src/bitcoin-tx.cpp +++ b/src/bitcoin-tx.cpp @@ -4,18 +4,18 @@ #include "base58.h" #include "clientversion.h" -#include "primitives/block.h" // for MAX_BLOCK_SIZE -#include "primitives/transaction.h" -#include "core_io.h" #include "coins.h" +#include "consensus/consensus.h" +#include "core_io.h" #include "keystore.h" +#include "primitives/transaction.h" #include "script/script.h" #include "script/sign.h" #include "ui_interface.h" // for _(...) #include "univalue/univalue.h" #include "util.h" -#include "utilstrencodings.h" #include "utilmoneystr.h" +#include "utilstrencodings.h" #include <stdio.h> |