Merge pull request #2 from libretro/master
authormeepingsnesroms <guicrith@gmail.com>
Fri, 1 Sep 2017 18:21:48 +0000 (11:21 -0700)
committerGitHub <noreply@github.com>
Fri, 1 Sep 2017 18:21:48 +0000 (11:21 -0700)
commit6c5b8733e0b286d5a4b4d9b7899e4c17a92cd04a
tree924720c49ac10c9ab3c98e3d3e06c8f4a06bc33c
parent646a63e41c53e5c1c971a4e305d4627dcee43c5e
parent874706c9a527d43f1a737b772225c120da86c31e
Merge pull request #2 from libretro/master

Update from master