Merge https://github.com/notaz/pcsx_rearmed
authortwinaphex <libretro@gmail.com>
Wed, 2 Mar 2016 03:03:11 +0000 (04:03 +0100)
committertwinaphex <libretro@gmail.com>
Wed, 2 Mar 2016 03:03:11 +0000 (04:03 +0100)
commitb9c86313f1a99cd8193fbf36ccc08295a9639725
treee5f9f1e2ab31509f72b93af4533dc7276a40bea5
parent966a06cd644d812dc75c9b91a58168fef6ab6db8
parent5644b26c23a4abd9511c56f39c369a46017585b8
Merge https://github.com/notaz/pcsx_rearmed
frontend/menu.c
libpcsxcore/new_dynarec/assem_arm.c