Merge branch 'master' of github.com:libretro/libretro-super

Conflicts:
	recipes/nintendo/3ds
This commit is contained in:
Radius 2015-09-23 17:32:21 +01:00
commit 212d059f1f

View File

@ -21,3 +21,4 @@ fb_alpha_cps1 libretro-fba_cps1 https://github.com/libretro/fba_cores_cps1.git P
fb_alpha_neo libretro-fba_neo https://github.com/libretro/fba_cores_neo.git PROJECT YES GENERIC Makefile . fb_alpha_neo libretro-fba_neo https://github.com/libretro/fba_cores_neo.git PROJECT YES GENERIC Makefile .
prboom libretro-prboom https://github.com/libretro/libretro-prboom.git PROJECT YES GENERIC Makefile . prboom libretro-prboom https://github.com/libretro/libretro-prboom.git PROJECT YES GENERIC Makefile .
mednafen_pce_fast libretro-beetle_pce_fast https://github.com/aliaspider/beetle-pce-fast-libretro.git psp_hw_render YES GENERIC Makefile . mednafen_pce_fast libretro-beetle_pce_fast https://github.com/aliaspider/beetle-pce-fast-libretro.git psp_hw_render YES GENERIC Makefile .
pcsx_rearmed libretro-pcsx_rearmed https://github.com/libretro/pcsx_rearmed.git PROJECT YES GENERIC Makefile.libretro .