mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-03-19 23:35:10 +01:00

Conflicts: Source/Core/VideoCommon/Src/PixelShaderGen.cpp Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp