Merge git://github.com/notaz/pcsx_rearmed
authortwinaphex <libretro@gmail.com>
Sun, 31 Mar 2013 22:50:34 +0000 (00:50 +0200)
committertwinaphex <libretro@gmail.com>
Sun, 31 Mar 2013 22:50:34 +0000 (00:50 +0200)
1  2 
Makefile.libretro

Simple merge