Merge git://github.com/notaz/pcsx_rearmed
authortwinaphex <autechre1024@hotmail.com>
Sun, 26 May 2013 21:34:56 +0000 (23:34 +0200)
committertwinaphex <autechre1024@hotmail.com>
Sun, 26 May 2013 21:34:56 +0000 (23:34 +0200)
1  2 
frontend/libretro.c

Simple merge