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)
commit805ccd449fdd62e05083b71c1e035e5e7347c73a
treeccf987b0e35f845449b40ce69244eff1c7c15565
parent0fbb0bcaabdb5ebb817cb8c23bbdcff7014d063f
parentf706644a50b9bc62de39f571b044c7f7c55078e4
Merge branch 'upstream/master'
src/map.cpp
src/mapgen.cpp