commit 97f1de66497c1071ac138e0c63152267b9d2978f
Merge: ecd13198 85221618
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Sun Aug 17 18:21:33 2014 -0400
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Sun Aug 17 18:21:33 2014 -0400

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

 src/i_sdlsound.c            |  2 +-
 src/strife/d_main.c         | 27 ++++++++++++++++-----------
 textscreen/txt_fileselect.c |  2 +-
 3 files changed, 18 insertions(+), 13 deletions(-)