diff options
author | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-06-27 06:56:26 -0700 |
---|---|---|
committer | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-06-27 06:56:26 -0700 |
commit | f37a3a84fafb91bcfc109fed95aa6d42726f1bf7 (patch) | |
tree | cde1e5f47f191beb4a9cefcd87872aef53b5fcec /src/voxel.cpp | |
parent | e261cc9e8fa67c9020fa0a82bd1a7041ecd351a0 (diff) | |
parent | 13cf5425db613dc0a4323c87a4988bb18fb87aca (diff) | |
download | minetest-f37a3a84fafb91bcfc109fed95aa6d42726f1bf7.tar.gz minetest-f37a3a84fafb91bcfc109fed95aa6d42726f1bf7.tar.bz2 minetest-f37a3a84fafb91bcfc109fed95aa6d42726f1bf7.zip |
Merge pull request #13 from Bahamada/upstream_merge
Upstream merge
Diffstat (limited to 'src/voxel.cpp')
-rw-r--r-- | src/voxel.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/voxel.cpp b/src/voxel.cpp index f60b641f1..5938f9016 100644 --- 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 |