diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-10-22 12:08:51 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-10-22 12:16:50 +0200 |
| commit | 25cc1cf8dc03b9ba0ae886d354855adc207b5b6e (patch) | |
| tree | 9298713771596e3ef2c45eb98b3564a995af7978 /src/qt | |
| parent | 13bddef87019f6608f40031619bee93479d27cd0 (diff) | |
| parent | 85c579e3a63cf505d6cedc454755265572e97d3e (diff) | |
| download | bitcoin-25cc1cf8dc03b9ba0ae886d354855adc207b5b6e.tar.xz | |
Merge pull request #4981
85c579e script: add a slew of includes all around and drop includes from script.h (Cory Fields)
db8eb54 script: move ToString and ValueString out of the header (Cory Fields)
e9ca428 script: add ToByteVector() for converting anything with begin/end (Cory Fields)
066e2a1 script: move CScriptID to standard.h and add a ctor for creating them from CScripts (Cory Fields)
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/test/paymentservertests.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/qt/test/paymentservertests.cpp b/src/qt/test/paymentservertests.cpp index 5d7fe96285..84cab01c50 100644 --- a/src/qt/test/paymentservertests.cpp +++ b/src/qt/test/paymentservertests.cpp @@ -8,6 +8,7 @@ #include "paymentrequestdata.h" #include "util.h" +#include "utilstrencodings.h" #include <openssl/x509.h> #include <openssl/x509_vfy.h> |