Merge pull request #1 from libretro/master
authormeepingsnesroms <guicrith@gmail.com>
Fri, 7 Apr 2017 16:12:17 +0000 (09:12 -0700)
committerGitHub <noreply@github.com>
Fri, 7 Apr 2017 16:12:17 +0000 (09:12 -0700)
commitf69f94c063891f2bfc95f35f524037f30b5bcc64
tree4af761aba62b81d1e0b36809d2a8d7a8beed86aa
parent726da67c8bd8163a9b5a67f36c7e715f021df7df
parentd9e770393ef9f049a40e34c06b12f0e3435dce46
Merge pull request #1 from libretro/master

update from master