Merge branch 'upstream/master'

[dragonfireclient.git] / src / voxel.cpp

diff --git a/src/voxel.cpp b/src/voxel.cpp
index f60b641f1af7954e3d9fd9cdab1c555d562ab946..5938f9016d7e202d161cc9c5d722c2870e9cf4ad 100644 (file)
--- a/src/voxel.cpp
+++ b/src/voxel.cpp
@@ -19,10 +19,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "voxel.h"
 #include "map.h"
-
-// For TimeTaker
-#include "utility.h"
+#include "utility.h" // For TimeTaker
 #include "gettime.h"
+#include "content_mapnode.h"
 
 /*
        Debug stuff