jprdonnelly/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-03-25 05:03:28 -04:00
Code Issues Packages Projects Releases Wiki Activity
Files
e0ffdda26e5fb34b2f0d59d5d45b0deda9c90c19
dolphin/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
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

44 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink