Merge git://github.com/notaz/pcsx_rearmed
authortwinaphex <libretro@gmail.com>
Mon, 1 Apr 2013 17:04:38 +0000 (19:04 +0200)
committertwinaphex <libretro@gmail.com>
Mon, 1 Apr 2013 17:04:38 +0000 (19:04 +0200)
1  2 
Makefile.libretro

Simple merge