commit 5ddb558a635208d9c08210be8283c83a8d45278f
Merge: 95a7160c fa3dc6f5
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Sun Apr 12 02:22:06 2015 +0000
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Sun Apr 12 02:22:06 2015 +0000

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

 opl/examples/droplay.c         |  1 +
 src/heretic/mn_menu.c          |  1 +
 src/heretic/p_saveg.c          |  2 ++
 src/i_sdlmusic.c               |  2 ++
 src/i_video.c                  | 14 --------------
 src/setup/execute.c            |  1 +
 src/setup/joystick.c           |  1 +
 textscreen/txt_sdl.c           |  8 --------
 textscreen/txt_window.c        |  1 +
 textscreen/txt_window_action.c |  1 +
 10 files changed, 10 insertions(+), 22 deletions(-)