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
commit383698186f954f52b8a957ef741175c437bf2502 (patch)
treef56ab1050d20d24cccaf830f3029193d025edf21 /src/mapgen.cpp
parentfb4c3ab4fbd29498a72a488199be58ead7505cc7 (diff)
parent7985d746f97ce1b37b6ca48a8a3e7ed70d02e4b0 (diff)
downloadminetest-383698186f954f52b8a957ef741175c437bf2502.tar.gz
minetest-383698186f954f52b8a957ef741175c437bf2502.tar.bz2
minetest-383698186f954f52b8a957ef741175c437bf2502.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;
}