summaryrefslogtreecommitdiff
path: root/src/mapgen.cpp
diff options
context:
space:
mode:
authorConstantin Wenger <constantin.wenger@googlemail.com>2011-07-22 20:53:29 +0200
committerConstantin Wenger <constantin.wenger@googlemail.com>2011-07-22 20:53:29 +0200
commit2abe6ed75c22a0cb3154043446100baab01624fd (patch)
tree1fce6995e63b1913c628c4ead34b6feb6686bf35 /src/mapgen.cpp
parenta12229f27148b9aec64c0fdeb1d739ad2062ac93 (diff)
parent805ccd449fdd62e05083b71c1e035e5e7347c73a (diff)
downloadminetest-2abe6ed75c22a0cb3154043446100baab01624fd.tar.gz
minetest-2abe6ed75c22a0cb3154043446100baab01624fd.tar.bz2
minetest-2abe6ed75c22a0cb3154043446100baab01624fd.zip
Merge remote-tracking 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;
}