commit 1fdb037589d76f2e7f7d464e0a92daecc7c1f241
Merge: 921a73c0 3ec49f40
Author:     Simon Howard <fraggle@soulsphere.org>
AuthorDate: Sun Jun 5 12:27:14 2016 -0400
Commit:     Simon Howard <fraggle@soulsphere.org>
CommitDate: Sun Jun 5 12:27:14 2016 -0400

    Merge remote-tracking branch 'origin/master' into sdl2-branch

 .travis.yml     | 30 ++++++++++++++++++++++++++++++
 opl/opl_queue.c |  2 +-
 src/d_iwad.c    |  2 +-
 3 files changed, 32 insertions(+), 2 deletions(-)