Merge branch 'upstream/master'
authorNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Fri, 22 Jul 2011 18:16:58 +0000 (20:16 +0200)
committerNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Fri, 22 Jul 2011 18:16:58 +0000 (20:16 +0200)
1  2 
src/map.cpp
src/mapgen.cpp

diff --cc src/map.cpp
Simple merge
diff --cc src/mapgen.cpp
Simple merge