commit b5db4a7536f093f0657d254b06910e491b0b5fad
Merge: f62b804e 63141cfc
Author:     Simon Howard <fraggle@soulsphere.org>
AuthorDate: Mon Sep 4 23:55:26 2017 -0400
Commit:     Simon Howard <fraggle@soulsphere.org>
CommitDate: Mon Sep 4 23:55:26 2017 -0400

    Merge branch 'sdl2-branch' of github.com:chocolate-doom/chocolate-doom into sdl2-branch

 .travis.sh  | 10 ++++++++++
 .travis.yml |  7 ++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)