commit d8054e60750f79b7a5b6d8ce73321823ad5de640
Merge: 435bf4b1 83a71dd8
Author:     Mike Swanson <mikeonthecomputer@gmail.com>
AuthorDate: Fri Aug 25 11:56:09 2017 -0700
Commit:     Mike Swanson <mikeonthecomputer@gmail.com>
CommitDate: Fri Aug 25 11:56:09 2017 -0700

    Merge branch 'master' into sdl2-branch

 src/d_iwad.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)