mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-09-04 08:51:17 +00:00
Conflicts: Source/Core/DolphinWX/Src/VideoConfigDiag.h Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h Source/Plugins/Plugin_VideoOGL/Src/Render.cpp Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp |
||
---|---|---|
.. | ||
Src | ||
CMakeLists.txt | ||
Plugin_VideoOGL.vcxproj | ||
Plugin_VideoOGL.vcxproj.filters |