Version
3.5-571
Branch
GLSL-master
Date
10 years, 2 months ago
Windows x64 Windows x86 Mac OS X
Commit
e0ffdda26e5fb34b2f0d59d5d45b0deda9c90c19
Change author
degasus
Change description
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