Merge https://github.com/notaz/pcsx_rearmed

author twinaphex <libretro@gmail.com>

Wed, 2 Mar 2016 03:03:11 +0000 (04:03 +0100)

committer twinaphex <libretro@gmail.com>

Wed, 2 Mar 2016 03:03:11 +0000 (04:03 +0100)
author twinaphex <libretro@gmail.com>
Wed, 2 Mar 2016 03:03:11 +0000 (04:03 +0100)
committer twinaphex <libretro@gmail.com>
Wed, 2 Mar 2016 03:03:11 +0000 (04:03 +0100)
diff --cc frontend/menu.c
Simple merge
diff --cc libpcsxcore/new_dynarec/assem_arm.c
Simple merge
author	twinaphex <libretro@gmail.com>
	Wed, 2 Mar 2016 03:03:11 +0000 (04:03 +0100)
committer	twinaphex <libretro@gmail.com>
	Wed, 2 Mar 2016 03:03:11 +0000 (04:03 +0100)
		1	2
frontend/menu.c	patch \|	diff1 \|	diff2 \|	blob \| history
libpcsxcore/new_dynarec/assem_arm.c	patch \|	diff1 \|	diff2 \|	blob \| history