commit 1f87d0ba3cedbf2a1244d1d6687f46ab8e992946
Merge: 3a140fe3 f1050ee4
Author:     Simon Howard <fraggle@soulsphere.org>
AuthorDate: Sun May 10 18:53:38 2015 -0400
Commit:     Simon Howard <fraggle@soulsphere.org>
CommitDate: Sun May 10 18:53:38 2015 -0400

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

 src/heretic/p_enemy.c | 4 ++--
 src/heretic/p_pspr.c  | 2 +-
 src/hexen/p_enemy.c   | 2 +-
 src/i_sdlmusic.c      | 4 ++--
 src/i_sdlsound.c      | 4 ++--
 src/midifile.c        | 8 ++++----
 src/strife/f_finale.c | 8 ++++----
 src/strife/g_game.c   | 1 -
 src/strife/p_setup.c  | 4 ++--
 src/strife/st_stuff.c | 4 ++--
 10 files changed, 20 insertions(+), 21 deletions(-)