commit e334de61580e02c7fce892dd185b5c3fd7ff6e5d
Merge: 9c2e7100 76d72fc4
Author:     Mike Swanson <mikeonthecomputer@gmail.com>
AuthorDate: Sun Aug 13 11:49:43 2017 -0700
Commit:     Mike Swanson <mikeonthecomputer@gmail.com>
CommitDate: Sun Aug 13 11:49:43 2017 -0700

    Merge commit '76d72fc48dc88fac4faa8b0b3907679eb8555778' into sdl2-branch

 src/v_video.c | 43 +++++++++++++++++++++++++++++++++----------
 1 file changed, 33 insertions(+), 10 deletions(-)