diff options
author | Perttu Ahola <celeron55@gmail.com> | 2011-07-23 15:46:00 +0300 |
---|---|---|
committer | Perttu Ahola <celeron55@gmail.com> | 2011-07-23 15:46:00 +0300 |
commit | 3882536d40656564b31c20008b55dfd77e848304 (patch) | |
tree | a1f9a97bf2a4cbd577018575fec55dec2de402bc /src/mapgen.cpp | |
parent | 2b3bc337087a7df15bbc7a745ee36e718e6d3950 (diff) | |
parent | f706644a50b9bc62de39f571b044c7f7c55078e4 (diff) | |
download | minetest-3882536d40656564b31c20008b55dfd77e848304.tar.gz minetest-3882536d40656564b31c20008b55dfd77e848304.tar.bz2 minetest-3882536d40656564b31c20008b55dfd77e848304.zip |
merged some stuff from upstream while merging delta
Diffstat (limited to 'src/mapgen.cpp')
-rw-r--r-- | src/mapgen.cpp | 2 |
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; } |