commit 074026b37ee26e78ae1c25907d2b7211b3e5fe91
Merge: 01a743cd 5160ceb4
Author:     Simon Howard <fraggle@soulsphere.org>
AuthorDate: Sun Feb 22 00:32:49 2015 -0500
Commit:     Simon Howard <fraggle@soulsphere.org>
CommitDate: Sun Feb 22 00:32:49 2015 -0500

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

 src/i_sdlmusic.c     | 5 +++--
 src/strife/s_sound.c | 7 ++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)