summaryrefslogtreecommitdiff
path: root/src/clientmedia.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/clientmedia.cpp
parentc09d026f0561ee3c6db821a7e193716f724a0e4a (diff)
downloadminetest-5a5854ea9d0bc346b00f48f40b538b7a8d68b37a.tar.gz
minetest-5a5854ea9d0bc346b00f48f40b538b7a8d68b37a.tar.bz2
minetest-5a5854ea9d0bc346b00f48f40b538b7a8d68b37a.zip
Move hex.h to util/
Diffstat (limited to 'src/clientmedia.cpp')
-rw-r--r--src/clientmedia.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/clientmedia.cpp b/src/clientmedia.cpp
index 2ccf04678..7eb505314 100644
--- a/src/clientmedia.cpp
+++ b/src/clientmedia.cpp
@@ -18,20 +18,20 @@ with this program; if not, write to the Free Software Foundation, Inc.,
*/
#include "clientmedia.h"
-#include "util/serialize.h"
-#include "util/sha1.h"
-#include "util/string.h"
#include "httpfetch.h"
#include "client.h"
-#include "network/networkprotocol.h"
#include "filecache.h"
#include "filesys.h"
-#include "hex.h"
#include "debug.h"
#include "log.h"
#include "porting.h"
#include "settings.h"
#include "main.h"
+#include "network/networkprotocol.h"
+#include "util/hex.h"
+#include "util/serialize.h"
+#include "util/sha1.h"
+#include "util/string.h"
static std::string getMediaCacheDir()
{