diff options
author | lethality <lee@lethality.me.uk> | 2014-02-18 22:24:24 +0000 |
---|---|---|
committer | lethality <lee@lethality.me.uk> | 2014-02-18 22:24:24 +0000 |
commit | 5933a5e9b1ade9f926145b67e557b87ae6dd6e8f (patch) | |
tree | 41c9c8b4c1818531251c292ce184601a8721aed4 /modules/encryption/enc_sha256.cpp | |
parent | f1c5c27f3fda90265d5da8205db1bdd4d12c9851 (diff) | |
parent | 109d8f431f3d25d56570a6aaa1af957867bbb80e (diff) |
Merge remote branch 'upstream/2.0' into 2.0
Diffstat (limited to 'modules/encryption/enc_sha256.cpp')
-rw-r--r-- | modules/encryption/enc_sha256.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/encryption/enc_sha256.cpp b/modules/encryption/enc_sha256.cpp index 7533c2891..cccbceea1 100644 --- a/modules/encryption/enc_sha256.cpp +++ b/modules/encryption/enc_sha256.cpp @@ -48,7 +48,7 @@ */ #include "module.h" -#include "encryption.h" +#include "modules/encryption.h" static const unsigned SHA256_DIGEST_SIZE = 256 / 8; static const unsigned SHA256_BLOCK_SIZE = 512 / 8; |