diff options
| author | Wladimir J. van der Laan <[email protected]> | 2018-11-05 11:33:54 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2018-11-05 11:34:29 +0100 |
| commit | bccb4d29a8080bf1ecda1fc235415a11d903a680 (patch) | |
| tree | f177fbf8cb8ef9a43e1f61ebf3b69fe07d566779 /src/script/script.cpp | |
| parent | Merge #14410: rpcwallet: 'ischange' field for 'getaddressinfo' RPC (diff) | |
| parent | scripted-diff: Move util files to separate directory. (diff) | |
| download | discoin-bccb4d29a8080bf1ecda1fc235415a11d903a680.tar.xz discoin-bccb4d29a8080bf1ecda1fc235415a11d903a680.zip | |
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/script.cpp')
| -rw-r--r-- | src/script/script.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/script.cpp b/src/script/script.cpp index 9bdf3ed80..982aa241e 100644 --- a/src/script/script.cpp +++ b/src/script/script.cpp @@ -6,7 +6,7 @@ #include <script/script.h> #include <tinyformat.h> -#include <utilstrencodings.h> +#include <util/strencodings.h> const char* GetOpName(opcodetype opcode) { |