mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2026-04-25 22:09:45 -05:00
ca22872dae
Conflicts: Source/Core/VideoCommon/Src/LightingShaderGen.cpp Source/Core/VideoCommon/Src/PixelShaderGen.cpp Source/Core/VideoCommon/Src/PixelShaderGen.h Source/Core/VideoCommon/Src/VertexShaderGen.cpp