merged some stuff from upstream while merging delta
authorPerttu Ahola <celeron55@gmail.com>
Sat, 23 Jul 2011 12:46:00 +0000 (15:46 +0300)
committerPerttu Ahola <celeron55@gmail.com>
Sat, 23 Jul 2011 12:46:00 +0000 (15:46 +0300)
commit3882536d40656564b31c20008b55dfd77e848304
treea1f9a97bf2a4cbd577018575fec55dec2de402bc
parent2b3bc337087a7df15bbc7a745ee36e718e6d3950
parentf706644a50b9bc62de39f571b044c7f7c55078e4
merged some stuff from upstream while merging delta
src/map.cpp
src/mapgen.cpp