minetest.git - modified minetest for gpcfs purposes

	Commit message (Collapse)	Author	Age
*	* key change menu now saving immediately	Perttu Ahola	2011-07-22
\|
*	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>
\| *	added new submenu for key assignment	teddydestodes	2011-06-01
\|/ \| \| \|	configwriting/saving isn't complete and will break your config if you use fancy keys
*	added missing #ifndef KEYCODE_HEADER to keycode.h	Perttu Ahola	2011-05-15
\|
*	Added key configuration in the configuration file.	Perttu Ahola	2011-05-14