aboutsummaryrefslogtreecommitdiff
path: root/src/util/string.cpp
diff options
context:
space:
mode:
authorLoic Blot <loic.blot@unix-experience.fr>2015-02-21 14:17:36 +0100
committerLoic Blot <loic.blot@unix-experience.fr>2015-02-21 14:32:35 +0100
commit5a5854ea9d0bc346b00f48f40b538b7a8d68b37a (patch)
tree424b67b977b791fa2fb1bbd4784d59b911bfa15d /src/util/string.cpp
parentc09d026f0561ee3c6db821a7e193716f724a0e4a (diff)
downloadminetest-5a5854ea9d0bc346b00f48f40b538b7a8d68b37a.tar.gz
minetest-5a5854ea9d0bc346b00f48f40b538b7a8d68b37a.tar.bz2
minetest-5a5854ea9d0bc346b00f48f40b538b7a8d68b37a.zip
Move hex.h to util/
Diffstat (limited to 'src/util/string.cpp')
-rw-r--r--src/util/string.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/util/string.cpp b/src/util/string.cpp
index babf7e62b..8861981b2 100644
--- a/src/util/string.cpp
+++ b/src/util/string.cpp
@@ -22,9 +22,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "numeric.h"
#include "log.h"
-#include "sha1.h"
#include "base64.h"
-#include "../hex.h"
+#include "hex.h"
+#include "sha1.h"
#include "../porting.h"
#include <algorithm>