diff options
| author | Wladimir J. van der Laan <[email protected]> | 2011-07-15 15:12:01 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2011-07-15 15:12:17 +0200 |
| commit | 19366be186a9a2efff1e6abfe8db59cd9f5f5843 (patch) | |
| tree | 3abb4adeab1a4e86a08bb5bfe61dedf8be178a1c /src/cryptopp/misc.h | |
| parent | fix quoting (diff) | |
| parent | Add call to request unconfirmed balance (diff) | |
| download | discoin-19366be186a9a2efff1e6abfe8db59cd9f5f5843.tar.xz discoin-19366be186a9a2efff1e6abfe8db59cd9f5f5843.zip | |
Merge remote-tracking branch 'satoshi/qtui'
Conflicts (resolved by copying files from remote branch):
.gitignore
src/cryptopp/cpu.cpp
src/cryptopp/cpu.h
src/cryptopp/cryptlib.h
src/cryptopp/iterhash.h
src/cryptopp/misc.h
src/cryptopp/secblock.h
src/cryptopp/sha.cpp
src/cryptopp/sha.h
src/cryptopp/smartptr.h
src/json/json_spirit_reader.cpp
src/json/json_spirit_value.cpp
src/json/json_spirit_writer.cpp
Diffstat (limited to 'src/cryptopp/misc.h')
| -rw-r--r-- | src/cryptopp/misc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cryptopp/misc.h b/src/cryptopp/misc.h index 5258e2abc..de8037bf6 100644 --- a/src/cryptopp/misc.h +++ b/src/cryptopp/misc.h @@ -1,8 +1,8 @@ #ifndef CRYPTOPP_MISC_H #define CRYPTOPP_MISC_H -#include "cryptopp/cryptlib.h" -#include "cryptopp/smartptr.h" +#include "cryptlib.h" +#include "smartptr.h" #include <string.h> // for memcpy and memmove #ifdef _MSC_VER |