flyinghead 7ed68952ba Merge remote-tracking branch 'origin/master' into fh/directx ... # Conflicts: # core/deps/patches/SDL.patch # core/hw/maple/maple_devs.cpp # core/rend/gl4/gles.cpp # core/rend/gles/gles.cpp # core/rend/gui.cpp # core/rend/gui.h # shell/apple/emulator-osx/reicast-osx.xcodeproj/project.pbxproj		2021-05-26 22:38:48 +02:00
..
files/test_gdis	Test GDIs: Include a testcase for #1006	2018-06-25 09:18:40 +02:00
src	Merge remote-tracking branch 'origin/master' into fh/directx	2021-05-26 22:38:48 +02:00