diff options
author | Pieter Wuille <pieter.wuille@gmail.com> | 2016-12-02 18:17:25 -0800 |
---|---|---|
committer | Pieter Wuille <pieter.wuille@gmail.com> | 2016-12-02 18:25:40 -0800 |
commit | 2efcfa5acfacb958973d9e8125e1d81f102e2dfd (patch) | |
tree | 6d62e14d6bb07b072421a426d72d70ae9dae3d9f /src/txmempool.cpp | |
parent | c36229b0b2e9d4554053f5c9fc451ac29a493b1f (diff) | |
parent | 76faa3cdfedbd3fc91be4ecfff77fc6dc18134fb (diff) | |
download | bitcoin-2efcfa5acfacb958973d9e8125e1d81f102e2dfd.tar.xz |
Merge #9260: Mrs Peacock in The Library with The Candlestick (killed main.{h,cpp})
76faa3c Rename the remaining main.{h,cpp} to validation.{h,cpp} (Matt Corallo)
e736772 Move network-msg-processing code out of main to its own file (Matt Corallo)
87c35f5 Remove orphan state wipe from UnloadBlockIndex. (Matt Corallo)
Diffstat (limited to 'src/txmempool.cpp')
-rw-r--r-- | src/txmempool.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/txmempool.cpp b/src/txmempool.cpp index 417a88cbef..c035a84db5 100644 --- a/src/txmempool.cpp +++ b/src/txmempool.cpp @@ -8,7 +8,7 @@ #include "clientversion.h" #include "consensus/consensus.h" #include "consensus/validation.h" -#include "main.h" +#include "validation.h" #include "policy/policy.h" #include "policy/fees.h" #include "streams.h" |