diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2014-09-08 20:34:01 +0200 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2014-09-08 20:34:01 +0200 |
| commit | eecd3c0fb0625b036f68a7830dda8edde21fcb90 (patch) | |
| tree | 1017c1bfb9599c9dfa3d6d8327d8b65862ee0d74 /src/main.h | |
| parent | df623d83dad6aa39141b066ebd2f870ee05acf41 (diff) | |
| parent | e088d65acbb181220b64a45a2a62bb79c0e40304 (diff) | |
| download | bitcoin-eecd3c0fb0625b036f68a7830dda8edde21fcb90.tar.xz | |
Merge pull request #4754
e088d65 Separate script/sign (jtimon)
9294a4b Separate CScriptCompressor (jtimon)
c4408a6 Separate script/standard (jtimon)
da03e6e Separate script/interpreter (jtimon)
cbd22a5 Move CScript class and dependencies to script/script (jtimon)
86dbeea Rename script.h/.cpp to scriptutils.h/.cpp (plus remove duplicated includes) (jtimon)
Rebased-by: Pieter Wuille
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main.h b/src/main.h index 8c0a743e24..30cccab2f1 100644 --- a/src/main.h +++ b/src/main.h @@ -15,7 +15,8 @@ #include "core.h" #include "net.h" #include "pow.h" -#include "script.h" +#include "script/script.h" +#include "script/standard.h" #include "sync.h" #include "txmempool.h" #include "uint256.h" |