diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2014-10-28 05:22:34 -0700 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2014-10-28 05:27:41 -0700 |
| commit | 723c7526368badda15df8ac1ffc047a0ab2e384a (patch) | |
| tree | ee490e57014cea5b59355a48251b5df69020a90c /src/bitcoin-tx.cpp | |
| parent | cd9114e5136ecc1f60baa43fffeeb632782f2353 (diff) | |
| parent | 99f41b9cf7b8e039cea75500a905498a1f6969f3 (diff) | |
| download | bitcoin-723c7526368badda15df8ac1ffc047a0ab2e384a.tar.xz | |
Merge pull request #5100
99f41b9 MOVEONLY: core.o -> core/block.o (jtimon)
561e9e9 MOVEONLY: Move script/compressor out of script and put CTxOutCompressor (from core) with it (jtimon)
999a2ab MOVEONLY: separate CTxUndo out of core (jtimon)
4a3587d MOVEONLY: Separate CTransaction and dependencies from core (jtimon)
eda3733 MOVEONLY: Move CFeeRate and Amount constants to amount.o (jtimon)
Diffstat (limited to 'src/bitcoin-tx.cpp')
| -rw-r--r-- | src/bitcoin-tx.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp index da37e60c7f..6f3409edf3 100644 --- a/src/bitcoin-tx.cpp +++ b/src/bitcoin-tx.cpp @@ -3,7 +3,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include "base58.h" -#include "core.h" +#include "core/transaction.h" #include "core_io.h" #include "keystore.h" #include "main.h" // for MAX_BLOCK_SIZE |