commit b9416dc6f9e569adcd067c9acd0b18e5d3240dd8
Merge: cb49854d 28e6533f
Author:     Mike Swanson <mikeonthecomputer@gmail.com>
AuthorDate: Tue Oct 2 14:04:12 2018 -0700
Commit:     Mike Swanson <mikeonthecomputer@gmail.com>
CommitDate: Tue Oct 2 14:04:12 2018 -0700

    Merge branch 'master' of gh:mfrancis95/chocolate-doom

 src/doom/doomstat.h |  2 +-
 src/doom/p_mobj.c   |  1 +
 src/doom/p_setup.c  | 12 ++++++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)