diff options
| author | Pieter Wuille <[email protected]> | 2014-10-28 05:22:34 -0700 |
|---|---|---|
| committer | Pieter Wuille <[email protected]> | 2014-10-28 05:27:41 -0700 |
| commit | 723c7526368badda15df8ac1ffc047a0ab2e384a (patch) | |
| tree | ee490e57014cea5b59355a48251b5df69020a90c /src/miner.cpp | |
| parent | Merge pull request #5065 (diff) | |
| parent | MOVEONLY: core.o -> core/block.o (diff) | |
| download | discoin-723c7526368badda15df8ac1ffc047a0ab2e384a.tar.xz discoin-723c7526368badda15df8ac1ffc047a0ab2e384a.zip | |
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/miner.cpp')
| -rw-r--r-- | src/miner.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/miner.cpp b/src/miner.cpp index eefccfd64..0235de3ab 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -5,7 +5,9 @@ #include "miner.h" -#include "core.h" +#include "amount.h" +#include "core/block.h" +#include "core/transaction.h" #include "hash.h" #include "main.h" #include "net.h" |