commit 05b7e25ca466172d071d17e9f3f665f992342431
Merge: 5ad3fa6c c7d23225
Author:     Simon Howard <fraggle+github@gmail.com>
AuthorDate: Thu Apr 7 19:58:09 2016 -0400
Commit:     Simon Howard <fraggle+github@gmail.com>
CommitDate: Thu Apr 7 19:58:09 2016 -0400

    Merge pull request #691 from jmtd/sdl2-branch-jmtd-input

    Input-related fixups for textscreen/setup in SDL2

 src/i_video.c        |  10 ----
 src/setup/display.c  | 152 +++------------------------------------------------
 textscreen/txt_sdl.c | 140 +++++++++--------------------------------------
 3 files changed, 35 insertions(+), 267 deletions(-)