commit 7e118463ae5ef0752ab0ae509eecfe409b82bdc3
Merge: ecf457dd ae2c4734
Author:     Simon Howard <fraggle+github@gmail.com>
AuthorDate: Thu Mar 13 10:20:39 2014 -0400
Commit:     Simon Howard <fraggle+github@gmail.com>
CommitDate: Thu Mar 13 10:20:39 2014 -0400

    Merge pull request #356 from fabiangreffrath/keybind-hexen

    Allow to rebind artifact keys in Hexen.

 src/hexen/g_game.c   | 32 +++++++++++++-------------
 src/m_config.c       | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/m_controls.c     | 18 +++++++++++++++
 src/m_controls.h     |  9 ++++++++
 src/setup/keyboard.c | 20 +++++++++++++++-
 5 files changed, 126 insertions(+), 17 deletions(-)