commit 6fb9d62d1424b81fa18476b56090034812defa0e
Merge: c9debbb1 74e95c61
Author:     Simon Howard <fraggle@soulsphere.org>
AuthorDate: Mon Nov 9 23:31:16 2015 -0500
Commit:     Simon Howard <fraggle@soulsphere.org>
CommitDate: Mon Nov 9 23:31:16 2015 -0500

    Merge branch 'master' of github.com:chocolate-doom/chocolate-doom

 src/doom/g_game.c   | 30 ++++++++++++++++++++++++---
 src/doom/st_stuff.c | 60 +++++++++++++++++++++++++++++++----------------------
 src/doom/wi_stuff.c |  2 +-
 3 files changed, 63 insertions(+), 29 deletions(-)