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)
1  2 
frontend/main.c
frontend/menu.c
libpcsxcore/cdriso.c
plugins/cdrcimg/cdrcimg.c

diff --cc frontend/main.c
Simple merge
diff --cc frontend/menu.c
Simple merge
Simple merge
Simple merge