mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-11 00:29:11 +01:00
786e49ed48
Conflicts: Source/Core/VideoBackends/Software/Src/EfbCopy.cpp Source/Core/VideoBackends/Software/Src/SWRenderer.cpp Source/Core/VideoBackends/Software/Src/SWRenderer.h Source/Core/VideoBackends/Software/Src/SWVideoConfig.cpp Source/Core/VideoBackends/Software/Src/SWmain.cpp