commit 77a480fcbf908bd39192b64af00487b6831a2d7b
Merge: 4987a479 cae001b8
Author:     Simon Howard <fraggle@soulsphere.org>
AuthorDate: Sun Feb 28 01:43:56 2016 -0500
Commit:     Simon Howard <fraggle@soulsphere.org>
CommitDate: Sun Feb 28 01:43:56 2016 -0500

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

 .github/CONTRIBUTING.md | 88 +++++++++++++++++++++++++++++++++++++++++++++++++
 src/Makefile.am         |  7 ++--
 src/doom/g_game.c       | 53 +++++++++++++++++++----------
 src/i_joystick.c        |  4 +--
 src/i_swap.h            |  4 +--
 src/strife/p_inter.c    |  3 +-
 6 files changed, 133 insertions(+), 26 deletions(-)