Merge pull request #193 from alfrix/master
authorTwinaphex <libretro@gmail.com>
Tue, 28 Aug 2018 22:36:46 +0000 (00:36 +0200)
committerGitHub <noreply@github.com>
Tue, 28 Aug 2018 22:36:46 +0000 (00:36 +0200)
commitb6169792c70a5ebb2e4baef63af5dc375be89770
treec76a2b472f8f3d0a287fc3d061a44ca827004dc7
parent5d705e23cff70876ca4ac0e8f0a357f4edfd9fd6
parent20a9e2f1a7a3218004c894244e4d4f629b8eb68f
Merge pull request #193 from alfrix/master

Fix Travis