merge remote-tracking branch 'notaz/master'
authorretro-wertz <retro-wertz@users.noreply.github.com>
Wed, 13 Mar 2019 01:22:23 +0000 (09:22 +0800)
committerretro-wertz <retro-wertz@users.noreply.github.com>
Wed, 13 Mar 2019 01:23:56 +0000 (09:23 +0800)
commit1bedbd6f272bd83af54c80eb0089ae1d6f4561a2
tree03e541dd603cafb9961d3579f741c879d21bc29d
parent5a49b8a2620bfdfaaf59ae25aa51bde44610371b
parent8a55ebcc07d4f860633db8c77bb9e16bcfa03313
merge remote-tracking branch 'notaz/master'
frontend/main.c
frontend/menu.c
libpcsxcore/cdriso.c
plugins/cdrcimg/cdrcimg.c