commit 20efac7ed823d4d47f0a497f92f9b8644b398313
Merge: 708d6e0a 7f49b3a9
Author:     Simon Howard <fraggle@soulsphere.org>
AuthorDate: Sun Feb 10 13:17:57 2019 -0500
Commit:     Simon Howard <fraggle@soulsphere.org>
CommitDate: Sun Feb 10 13:17:57 2019 -0500

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

 src/strife/d_main.c    | 10 +++++-----
 src/strife/deh_cheat.c |  2 +-
 src/strife/deh_misc.c  |  2 +-
 src/strife/doomstat.c  |  2 +-
 src/strife/doomstat.h  |  3 +--
 src/strife/g_game.c    | 18 +++++++++---------
 src/strife/hu_lib.c    |  4 ++--
 src/strife/hu_lib.h    |  2 +-
 src/strife/hu_stuff.c  |  2 +-
 src/strife/hu_stuff.h  |  2 +-
 src/strife/info.c      |  2 +-
 src/strife/info.h      |  4 ++--
 src/strife/m_menu.c    |  4 ++--
 src/strife/p_dialog.c  |  2 +-
 src/strife/p_local.h   |  2 +-
 src/strife/p_spec.c    |  2 +-
 src/strife/p_user.c    |  4 ++--
 src/strife/r_things.c  |  6 +++---
 src/strife/r_things.h  |  2 +-
 src/strife/st_stuff.c  |  2 +-
 20 files changed, 38 insertions(+), 39 deletions(-)