summaryrefslogtreecommitdiff
path: root/src/keycode.cpp
Commit message (Collapse)AuthorAge
* Merge branch 'master' of https://github.com/erlehmann/minetest-delta.git ↵Sebastian Rühl2011-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 assignmentteddydestodes2011-06-01
|/ | | | configwriting/saving isn't complete and will break your config if you use fancy keys
* Added key configuration in the configuration file.Perttu Ahola2011-05-14