commit a43186b2beaab5fda826fe846d252fa6186d835a
Merge: 0ec3d826 a0a4303a
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Wed Oct 1 23:58:25 2014 -0400
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Wed Oct 1 23:58:25 2014 -0400

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

 src/deh_io.c         | 1 -
 src/deh_main.c       | 1 +
 src/strife/p_floor.c | 3 ++-
 src/strife/p_user.c  | 8 ++++++--
 4 files changed, 9 insertions(+), 4 deletions(-)