Merge branch 'master' of https://github.com/notaz/pcsx_rearmed into notaz-master
authordankcushions <chris.bransden@gmail.com>
Fri, 22 Apr 2016 14:05:41 +0000 (15:05 +0100)
committerdankcushions <chris.bransden@gmail.com>
Fri, 22 Apr 2016 14:05:41 +0000 (15:05 +0100)
commitcb4d282af668df3bdbd428be5a5ad26996cd0f4f
tree93e9704ebb9395c4f6c7bab847d9df7abb005d3d
parent4ed8f00a1221b15925117f1c7413b4640e6e7198
parent4da64aea132e752bfea9448238599653e741b465
Merge branch 'master' of https://github.com/notaz/pcsx_rearmed into notaz-master
frontend/libretro.c
frontend/main.c
frontend/menu.c
libpcsxcore/cdriso.c