fix
Merge branch 'master' of https://github.com/aliaspider/mupen64plus-libretro