commit 7caca1df65b938b1f170042d007f64aab2191b01
Merge: 9ab44a4f 81f2c5b2
Author:     James Haley <haleyjd@hotmail.com>
AuthorDate: Fri Aug 26 00:23:07 2016 -0500
Commit:     James Haley <haleyjd@hotmail.com>
CommitDate: Fri Aug 26 00:23:07 2016 -0500

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

 src/doom/p_spec.c   | 2 +-
 src/strife/p_spec.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)