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)
commit5948832fca5e81cc263bb57d784b6a81c19d1d71
tree19b423be5876fcd8183d5bf77316135093f8fd11
parent268c669a9bccc1b5ebf0ebd169b540642406d142
parent19a784e63f95b0eb32d252fabb144531f695a983
Merge git://github.com/notaz/pcsx_rearmed
frontend/libretro.c