1 Commits (fb6ac9a1a6b68e87665a9e1692295230ebcef8db)

Author	SHA1	Message	Date
Sebastian Rühl	033ae0dcae	Merge branch 'master' of https://github.com/erlehmann/minetest-delta.git into upstream_merge ... Conflicts: .gitignore CMakeLists.txt data/heart.png src/CMakeLists.txt src/game.cpp src/guiMainMenu.cpp src/inventory.cpp src/map.cpp src/mapblock.cpp src/mapnode.cpp src/mapnode.h src/materials.cpp src/server.cpp Signed-off-by: Sebastian Rühl <bahamada_basti@yahoo.de>	2011-06-26 12:24:32 +02:00