commit 79b2fed04cf818c81186a8df50a566ec2415cc40
Merge: 31accc83 7f7a72d6
Author:     Simon Howard <fraggle@soulsphere.org>
AuthorDate: Sun Jan 27 23:37:51 2019 -0500
Commit:     Simon Howard <fraggle@soulsphere.org>
CommitDate: Sun Jan 27 23:37:51 2019 -0500

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

 .travis.sh              | 10 ++++++++--
 .travis.yml             |  1 +
 configure.ac            |  2 +-
 src/doom/d_main.c       |  2 +-
 src/doom/m_menu.c       | 16 ++++++++++++++--
 src/doom/p_setup.c      |  5 +++++
 src/doom/p_setup.h      |  2 ++
 src/hexen/sc_man.c      |  7 +------
 src/i_glob.c            |  5 +++++
 src/m_misc.c            |  2 +-
 src/setup/execute.c     |  6 +++---
 src/setup/execute.h     |  2 +-
 src/setup/joystick.c    |  6 +++---
 src/setup/keyboard.c    |  4 ++--
 src/setup/mainmenu.c    |  2 +-
 src/setup/mode.c        | 16 ++++++++--------
 src/setup/mode.h        |  4 ++--
 src/setup/mouse.c       |  2 +-
 src/setup/multiplayer.c |  6 +++---
 src/setup/txt_joyaxis.c |  2 +-
 src/w_wad.c             |  9 +++++++++
 src/w_wad.h             |  3 +++
 22 files changed, 76 insertions(+), 38 deletions(-)