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
commit805ccd449fdd62e05083b71c1e035e5e7347c73a (patch)
treeccf987b0e35f845449b40ce69244eff1c7c15565 /src/mapgen.cpp
parent0fbb0bcaabdb5ebb817cb8c23bbdcff7014d063f (diff)
parentf706644a50b9bc62de39f571b044c7f7c55078e4 (diff)
downloadminetest-805ccd449fdd62e05083b71c1e035e5e7347c73a.tar.gz
minetest-805ccd449fdd62e05083b71c1e035e5e7347c73a.tar.bz2
minetest-805ccd449fdd62e05083b71c1e035e5e7347c73a.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;
}