Flyinghead 885a0508c0 Merge remote-tracking branch 'origin/master' into dev ... # Conflicts: # core/hw/aica/sgc_if.cpp # core/hw/naomi/naomi.cpp # core/hw/sh4/dyna/driver.cpp		2023-02-28 20:02:23 +01:00
..
APPLE	move khronos to deps. get rid of old controller mappings and pandora	2023-02-03 10:42:43 +01:00
EGL	move khronos to deps. get rid of old controller mappings and pandora	2023-02-03 10:42:43 +01:00
GL3	move khronos to deps. get rid of old controller mappings and pandora	2023-02-03 10:42:43 +01:00
GL4	Merge remote-tracking branch 'origin/master' into dev	2023-02-28 20:02:23 +01:00
GLES2	move khronos to deps. get rid of old controller mappings and pandora	2023-02-03 10:42:43 +01:00
GLES3	move khronos to deps. get rid of old controller mappings and pandora	2023-02-03 10:42:43 +01:00
GLES32	move khronos to deps. get rid of old controller mappings and pandora	2023-02-03 10:42:43 +01:00
KHR	move khronos to deps. get rid of old controller mappings and pandora	2023-02-03 10:42:43 +01:00