summaryrefslogtreecommitdiff
path: root/src/server.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/server.cpp
parentc09d026f0561ee3c6db821a7e193716f724a0e4a (diff)
downloadminetest-5a5854ea9d0bc346b00f48f40b538b7a8d68b37a.tar.gz
minetest-5a5854ea9d0bc346b00f48f40b538b7a8d68b37a.tar.bz2
minetest-5a5854ea9d0bc346b00f48f40b538b7a8d68b37a.zip
Move hex.h to util/
Diffstat (limited to 'src/server.cpp')
-rw-r--r--src/server.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server.cpp b/src/server.cpp
index 0d52863d2..6c51aec4b 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -51,11 +51,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "content_abm.h"
#include "content_sao.h"
#include "mods.h"
-#include "util/sha1.h"
-#include "util/base64.h"
#include "sound.h" // dummySoundManager
#include "event_manager.h"
-#include "hex.h"
#include "serverlist.h"
#include "util/string.h"
#include "util/mathconstants.h"
@@ -63,6 +60,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "util/serialize.h"
#include "util/thread.h"
#include "defaultsettings.h"
+#include "util/base64.h"
+#include "util/sha1.h"
+#include "util/hex.h"
class ClientNotFoundException : public BaseException
{