commit 591422453f84b941b6c77e0e9ebf0c3750406d3e
Merge: 154c1d54 d2cdb398
Author:     Simon Howard <fraggle@soulsphere.org>
AuthorDate: Sat Jan 6 22:30:47 2018 +0000
Commit:     Simon Howard <fraggle@soulsphere.org>
CommitDate: Sat Jan 6 22:30:47 2018 +0000

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

 data/Makefile.am | 2 +-
 rpm.spec.in      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)