Merge branch 'master' of https://github.com/notaz/pcsx_rearmed into notaz-master

author dankcushions <chris.bransden@gmail.com>

Fri, 22 Apr 2016 14:05:41 +0000 (15:05 +0100)

committer dankcushions <chris.bransden@gmail.com>

Fri, 22 Apr 2016 14:05:41 +0000 (15:05 +0100)
author dankcushions <chris.bransden@gmail.com>
Fri, 22 Apr 2016 14:05:41 +0000 (15:05 +0100)
committer dankcushions <chris.bransden@gmail.com>
Fri, 22 Apr 2016 14:05:41 +0000 (15:05 +0100)
diff --cc frontend/libretro.c
Simple merge
diff --cc frontend/main.c
Simple merge
diff --cc frontend/menu.c
Simple merge
diff --cc libpcsxcore/cdriso.c
Simple merge
author	dankcushions <chris.bransden@gmail.com>
	Fri, 22 Apr 2016 14:05:41 +0000 (15:05 +0100)
committer	dankcushions <chris.bransden@gmail.com>
	Fri, 22 Apr 2016 14:05:41 +0000 (15:05 +0100)
		1	2
frontend/libretro.c	patch \|	diff1 \|	diff2 \|	blob \| history
frontend/main.c	patch \|	diff1 \|	diff2 \|	blob \| history
frontend/menu.c	patch \|	diff1 \|	diff2 \|	blob \| history
libpcsxcore/cdriso.c	patch \|	diff1 \|	diff2 \|	blob \| history