commit 68d11b6ff1cb15cdf80d29443d2c3e15da434fa3
Merge: ac228b34 76fa96e1
Author:     Simon Howard <fraggle@soulsphere.org>
AuthorDate: Mon Jan 20 18:17:57 2020 -0500
Commit:     GitHub <noreply@github.com>
CommitDate: Mon Jan 20 18:17:57 2020 -0500

    Merge pull request #1238 from chocolate-doom/heretic_key_arti

    Heretic: artifacts can be binded to own keys

 src/heretic/g_game.c | 45 ++++++++++++++++++++++++++++++--
 src/m_config.c       | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/m_controls.c     | 20 +++++++++++++++
 src/m_controls.h     | 10 ++++++++
 src/setup/keyboard.c | 18 +++++++++++++
 5 files changed, 163 insertions(+), 2 deletions(-)