Merge branch 'upstream/master'
authorNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Thu, 14 Jul 2011 20:43:22 +0000 (22:43 +0200)
committerNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Thu, 14 Jul 2011 20:43:28 +0000 (22:43 +0200)
commitaf05e4b2defde537f3b953a7dae0ef44fae225aa
tree3f751014432b35df1cc2fd6fb976410e86b70e73
parent4415d95c503f083d871abaf84516f2b6487ecb60
parent81535f6277b66c869cda7125b2aeaf99e8078b92
Merge branch 'upstream/master'

Conflicts:
data/oerkki1.png
src/client.cpp
13 files changed:
CMakeLists.txt
src/CMakeLists.txt
src/client.cpp
src/content_inventory.cpp
src/content_mapblock.cpp
src/content_mapnode.cpp
src/defaultsettings.cpp
src/environment.cpp
src/farmesh.cpp
src/game.cpp
src/map.cpp
src/mapgen.cpp
src/mapnode.h