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)
commit7985d746f97ce1b37b6ca48a8a3e7ed70d02e4b0
tree503647a4d173e9bd29dd489310dedb0db37088ff
parenta45f287ae1b96742dfd03a01e0b558385e7b1384
parentf706644a50b9bc62de39f571b044c7f7c55078e4
Merge branch 'upstream/master'
src/map.cpp
src/mapgen.cpp