dahjah/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-02-11 08:55:44 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity
45c70be83f
dolphin/Source/Plugins/Plugin_VideoOGL
History
NeoBrainX 3253603ae7 Merge 'master' into shader-uids-awesome. 
Conflicts:
	Source/Core/VideoCommon/Src/LightingShaderGen.cpp
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp
	Source/Core/VideoCommon/Src/PixelShaderGen.h
	Source/Core/VideoCommon/Src/PixelShaderManager.cpp
	Source/Core/VideoCommon/Src/VertexShaderGen.cpp
	Source/Core/VideoCommon/Src/VertexShaderGen.h
	Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h
	Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
	Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h
2013-03-26 22:21:19 +01:00
..
Src Merge 'master' into shader-uids-awesome. 2013-03-26 22:21:19 +01:00
CMakeLists.txt Merge branch 'master' into GLSL-master 2013-03-06 15:59:29 +01:00
Plugin_VideoOGL.vcxproj Merge branch 'master' into GLSL-master 2013-03-06 15:59:29 +01:00
Plugin_VideoOGL.vcxproj.filters Merge branch 'master' into GLSL-master 2013-03-06 15:59:29 +01:00