commit 166e2bca936409c8ec78867bc0fc04eeba418e6e
Merge: df05cd8e eaf851e0
Author:     Simon Howard <fraggle@soulsphere.org>
AuthorDate: Sat Jan 14 21:55:08 2017 +0000
Commit:     Simon Howard <fraggle@soulsphere.org>
CommitDate: Sat Jan 14 21:55:08 2017 +0000

    Merge remote-tracking branch 'origin/master' into sdl2-branch

 NEWS.md                 |   6 ++
 man/INSTALL.template    |   4 +-
 pkg/osx/GNUmakefile     |   2 +-
 src/doom/d_main.c       |  12 +--
 src/hexen/h2_main.c     |  37 +++++--
 src/m_config.c          |  34 ++++++-
 src/setup/multiplayer.c |   2 +-
 src/strife/Makefile.am  |   4 +-
 src/strife/d_main.c     | 266 +++++++++++++++++++++++++++++++++++++++---------
 9 files changed, 293 insertions(+), 74 deletions(-)