Merge pull request #33 from dankcushions/master
authorTwinaphex <libretro@gmail.com>
Fri, 22 Apr 2016 15:06:53 +0000 (17:06 +0200)
committerTwinaphex <libretro@gmail.com>
Fri, 22 Apr 2016 15:06:53 +0000 (17:06 +0200)
commit18ef7635b0b265350eb8304a26edeb8d4b0b2e19
tree93e9704ebb9395c4f6c7bab847d9df7abb005d3d
parent4ed8f00a1221b15925117f1c7413b4640e6e7198
parent163249087400935f084080127990bc762e83319c
Merge pull request #33 from dankcushions/master

Merging in latest upstream changes