Merge remote-tracking branch 'origin/upstream'
authorNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Sat, 30 Jul 2011 16:53:54 +0000 (18:53 +0200)
committerNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Sat, 30 Jul 2011 16:55:43 +0000 (18:55 +0200)
commit4ef9c7675ada82961d83601712a47ebad78b67b5
treecdfd863219a8dc1031e727740e7d895296c5855d
parentf69123050b62ada635751b7155bb6822b0a97a9b
parentdbea511a6f877450cfd5adb86efa55a8f00cc9a1
Merge remote-tracking branch 'origin/upstream'
src/main.cpp
src/map.cpp
src/mapblock.cpp
src/mapnode.h