mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2026-01-16 08:53:16 -03:00
Conflicts: Source/Core/VideoCommon/Src/PixelShaderGen.cpp Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp