Merge https://github.com/notaz/pcsx_rearmed
authortwinaphex <libretro@gmail.com>
Sat, 4 Apr 2015 17:17:58 +0000 (19:17 +0200)
committertwinaphex <libretro@gmail.com>
Sat, 4 Apr 2015 17:17:58 +0000 (19:17 +0200)
commit998ff8f6009ca7a4d8db9039baf239a1931b5e63
treef6f1d15076e8a3f97d066693ed3ed83c6cf43898
parentcb4c1aa6827011c7f564da8adf98fa7be9072b2a
parent85f2398236b54db46340dad14330102f281ca4f3
Merge https://github.com/notaz/pcsx_rearmed