summaryrefslogtreecommitdiff
path: root/src/mapgen.cpp
diff options
context:
space:
mode:
authorNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>2011-07-22 20:16:58 +0200
committerNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>2011-07-22 20:16:58 +0200
commit7985d746f97ce1b37b6ca48a8a3e7ed70d02e4b0 (patch)
tree503647a4d173e9bd29dd489310dedb0db37088ff /src/mapgen.cpp
parenta45f287ae1b96742dfd03a01e0b558385e7b1384 (diff)
parentf706644a50b9bc62de39f571b044c7f7c55078e4 (diff)
downloadminetest-7985d746f97ce1b37b6ca48a8a3e7ed70d02e4b0.tar.gz
minetest-7985d746f97ce1b37b6ca48a8a3e7ed70d02e4b0.tar.bz2
minetest-7985d746f97ce1b37b6ca48a8a3e7ed70d02e4b0.zip
Merge branch 'upstream/master'
Diffstat (limited to 'src/mapgen.cpp')
-rw-r--r--src/mapgen.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index dfea862a5..8dda93c96 100644
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -1331,7 +1331,7 @@ void make_block(BlockMakeData *data)
{
if(data->no_op)
{
- dstream<<"makeBlock: no-op"<<std::endl;
+ //dstream<<"makeBlock: no-op"<<std::endl;
return;
}