minetest.git - modified minetest for gpcfs purposes

	Commit message (Collapse)	Author	Age
*	Merge branch 'master' of https://github.com/erlehmann/minetest-delta.git ↵	Sebastian Rühl	2011-06-26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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>
*	New map generator added (and SQLite, messed up the commits at that time...) ↵	Perttu Ahola	2011-06-25
\| \| \| \|	(import from temporary git repo)
*	Moved stuff from mapblock{h,cpp} to mapblock_mesh.{h,cpp} and ↵	Perttu Ahola	2011-06-17
	content_mapblock.{h,cpp}