commit 1f07cbb79638fa2822cbe577cd5e1010190c8950
Merge: 07e9f3b9 3235eb70
Author:     Fabian Greffrath <fabian@greffrath.com>
AuthorDate: Thu Dec 20 12:00:04 2018 +0100
Commit:     Fabian Greffrath <fabian@greffrath.com>
CommitDate: Thu Dec 20 12:00:04 2018 +0100

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

 src/heretic/doomdef.h |  1 +
 src/heretic/p_mobj.c  |  1 +
 src/heretic/p_setup.c | 13 +++++++++++++
 3 files changed, 15 insertions(+)