mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-12-23 06:57:08 +00:00
Conflicts: Source/Core/VideoCommon/Src/VideoConfig.h Source/Core/VideoCommon/VideoCommon.vcxproj.filters Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp |
||
|---|---|---|
| .. | ||
| Src | ||
| CMakeLists.txt | ||
| Common.vcxproj | ||
| Common.vcxproj.filters | ||
| make_scmrev.h.js | ||
| SVNRevGen.vcxproj | ||