ref: 1430facdb3ae25a92d515bc1daf71c860ef20f1e
parent: 42445b60eda121966524c4533d070c56f69e1844
parent: f30f390e513e456c2bdec64726469a50097e4371
author: Simon Howard <fraggle@soulsphere.org>
date: Thu Jun 4 17:07:07 EDT 2015
Merge branch 'master' into sdl2-branch Conflicts: src/i_video.c src/setup/display.c textscreen/txt_sdl.c