diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-12-03 12:05:43 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-12-03 12:05:43 +0100 |
| commit | a0417b8cc840ff6f49b4fb1f8ceef54f8e3d0df1 (patch) | |
| tree | 16a317d4b2132094e8e774c1e9fe0a1a88f36820 /src/miner.cpp | |
| parent | c2d7c6134e282a974f8f6e2a134f0132f90dc2a0 (diff) | |
| parent | d22701118413b876579c020ea90ecf7a0d5671cb (diff) | |
| download | bitcoin-a0417b8cc840ff6f49b4fb1f8ceef54f8e3d0df1.tar.xz | |
Merge pull request #5306
d227011 MOVEONLY: core/ -> primitives/ (Luke Dashjr)
Diffstat (limited to 'src/miner.cpp')
| -rw-r--r-- | src/miner.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/miner.cpp b/src/miner.cpp index 660173f35b..ad29431421 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -6,8 +6,8 @@ #include "miner.h" #include "amount.h" -#include "core/block.h" -#include "core/transaction.h" +#include "primitives/block.h" +#include "primitives/transaction.h" #include "hash.h" #include "main.h" #include "net.h" |