commit 6b422a3ed52742adeb57da3fa934090130696d2a
Merge: b83132a4 af553de8
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Wed Aug 13 21:14:21 2014 -0400
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Wed Aug 13 21:14:21 2014 -0400

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

 configure.ac                    |  7 ++++++-
 man/.gitignore                  |  8 ++++++++
 msvc/doom.vcproj                |  7 ++++++-
 msvc/heretic.vcproj             | 14 +++++++++++---
 msvc/hexen.vcproj               | 14 +++++++++++---
 src/.gitignore                  |  5 +++++
 src/Makefile.am                 | 15 ++++++++++++++-
 src/deh_io.c                    |  1 +
 src/deh_main.c                  |  6 ++++++
 src/doom-screensaver.desktop.in |  6 ++----
 src/doom.desktop.in             |  2 +-
 src/doom/p_enemy.c              |  5 -----
 src/doom/p_local.h              | 14 ++++++++++++++
 src/doom/p_map.c                | 11 -----------
 src/heretic.desktop.in          |  7 +++++++
 src/hexen.desktop.in            |  7 +++++++
 src/setup/joystick.c            | 27 +++++++++++++++++++++++++++
 src/setup/setup.desktop.in      |  6 +++---
 src/strife.desktop.in           |  7 +++++++
 19 files changed, 136 insertions(+), 33 deletions(-)