dahjah/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-12-21 22:17:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
a1c5e90083
dolphin/Source/Core
History
degasus a1c5e90083 Merge branch 'master' into GLSL-master 
Conflicts:
	CMakeLists.txt
	Source/Core/DolphinWX/CMakeLists.txt
	Source/Core/DolphinWX/Src/GLInterface.h
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp
	Source/Core/VideoCommon/Src/TextureCacheBase.cpp
	Source/Core/VideoCommon/Src/VertexManagerBase.cpp
	Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
	Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
	Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj
	Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj.filters
	Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
	Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
	Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/main.cpp
2013-03-06 15:59:29 +01:00
..
AudioCommon ARM Support without GLSL 2013-02-26 13:49:00 -06:00
Common Merge branch 'master' into GLSL-master 2013-03-06 15:59:29 +01:00
Core Merge branch 'master' into GLSL-master 2013-03-06 15:59:29 +01:00
DiscIO Fixed issue 5270. Don't ask me how, I just clean up code and then it works! I think it was int overflow. 2013-03-05 00:35:24 -06:00
DolphinWX Merge branch 'master' into GLSL-master 2013-03-06 15:59:29 +01:00
InputCommon Merge branch 'master' into windows-unicode 2013-03-02 15:33:32 -06:00
VideoCommon Merge branch 'master' into GLSL-master 2013-03-06 15:59:29 +01:00
CMakeLists.txt