piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-15 13:57:57 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity
e0ffdda26e
dolphin/Source/Plugins/Plugin_VideoOGL
History
degasus e0ffdda26e Merge branch 'immediate-removal' into GLSL-master 
Conflicts:
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp
	Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp

immediate-removal is a new created branch seperated from master but reverted the revert of immediate-removal
so we get less conflicts by merging
2013-01-24 16:58:28 +01:00
..
Src Merge branch 'immediate-removal' into GLSL-master 2013-01-24 16:58:28 +01:00
CMakeLists.txt Merge branch 'master' into GLSL-master 2012-12-27 10:36:54 +01:00
Plugin_VideoOGL.vcxproj remove cg from windows project files 2012-12-28 01:08:29 +01:00
Plugin_VideoOGL.vcxproj.filters add ProgramShaderCache.* to visual studio project files 2012-10-09 23:41:05 -05:00