commit 9ec3bb73ce95b11dbc5cac344acd4bfa22a81181
Merge: b9690ac0 5a35c438
Author:     Simon Howard <fraggle+github@gmail.com>
AuthorDate: Thu Dec 26 08:00:51 2013 -0800
Commit:     Simon Howard <fraggle+github@gmail.com>
CommitDate: Thu Dec 26 08:00:51 2013 -0800

    Merge pull request #318 from svdijk/bugfix

    Heretic/Hexen/Strife bugfixes from Sander van Dijk.

 src/heretic/g_game.c | 52 ++++++++++++++++++++++++++++++++++++++----
 src/hexen/g_game.c   | 64 +++++++++++++++++++++++++++++++++++++++++++++-------
 src/setup/keyboard.c |  2 +-
 3 files changed, 104 insertions(+), 14 deletions(-)