mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-02-19 10:46:28 +01:00

Conflicts: Source/Core/VideoCommon/Src/VideoConfig.h Source/Plugins/Plugin_VideoDX9/Src/main.cpp Source/Plugins/Plugin_VideoOGL/Src/Render.cpp