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)
commit3560f0de082a8950a84e2e866981f8bdfd05428a
treedfb765f7e590189f05e7807c80be72e6ecf8cc4d
parent5146c826be9386cc2adeb8f678063a2f9cfc1dee
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