diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-11-05 11:33:54 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-11-05 11:34:29 +0100 |
| commit | bccb4d29a8080bf1ecda1fc235415a11d903a680 (patch) | |
| tree | f177fbf8cb8ef9a43e1f61ebf3b69fe07d566779 /src/script/standard.cpp | |
| parent | b74078868b5e7a594aaf2cec08772e0b6324bc38 (diff) | |
| parent | 2068f089c8b7b90eb4557d3f67ea0f0ed2059a23 (diff) | |
| download | bitcoin-bccb4d29a8080bf1ecda1fc235415a11d903a680.tar.xz | |
Merge #14555: Move util files to directory
2068f089c8b7b90eb4557d3f67ea0f0ed2059a23 scripted-diff: Move util files to separate directory. (Jim Posen)
Pull request description:
As discussed [here](https://github.com/bitcoin/bitcoin/pull/14074#issuecomment-429090584), this establishes a `util/` directory to introduce more organizational structure and have a clear place for new util files. It's really not scary to review, it's just one big scripted diff.
Tree-SHA512: 39cf15480d7d35e987b6088d52a857a2d5b1802e36c6b815eb42718d80cd95e669757af9bcc7c04426cd8523662cb1050b8da1e2377d3730672820ed298b894b
Diffstat (limited to 'src/script/standard.cpp')
| -rw-r--r-- | src/script/standard.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/script/standard.cpp b/src/script/standard.cpp index 08ba1b1e0f..31bfd04b0f 100644 --- a/src/script/standard.cpp +++ b/src/script/standard.cpp @@ -8,8 +8,8 @@ #include <crypto/sha256.h> #include <pubkey.h> #include <script/script.h> -#include <util.h> -#include <utilstrencodings.h> +#include <util/system.h> +#include <util/strencodings.h> typedef std::vector<unsigned char> valtype; |