aboutsummaryrefslogtreecommitdiff
path: root/src/cryptopp/sha.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2011-07-15 15:12:01 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2011-07-15 15:12:17 +0200
commit19366be186a9a2efff1e6abfe8db59cd9f5f5843 (patch)
tree3abb4adeab1a4e86a08bb5bfe61dedf8be178a1c /src/cryptopp/sha.cpp
parent249c6818f171b75930736872d61b0cdcda7e9832 (diff)
parenta35ee9633690fbadc001b2d8fe1dd3ebb852dc25 (diff)
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/sha.cpp')
-rw-r--r--src/cryptopp/sha.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/cryptopp/sha.cpp b/src/cryptopp/sha.cpp
index 1ff6c0b45c..fd0b0a2596 100644
--- a/src/cryptopp/sha.cpp
+++ b/src/cryptopp/sha.cpp
@@ -5,14 +5,14 @@
// use "cl /EP /P /DCRYPTOPP_GENERATE_X64_MASM sha.cpp" to generate MASM code
-#include "cryptopp/pch.h"
+#include "pch.h"
#ifndef CRYPTOPP_IMPORTS
#ifndef CRYPTOPP_GENERATE_X64_MASM
-#include "cryptopp/sha.h"
-#include "cryptopp/misc.h"
-#include "cryptopp/cpu.h"
+#include "sha.h"
+#include "misc.h"
+#include "cpu.h"
NAMESPACE_BEGIN(CryptoPP)