Version
3.5-1716
Branch
tev-fixes3
Date
9 years, 8 months ago
Windows x64 Windows x86 Mac OS X Android
Commit
bdefe24ec0f4551216bf4f8c60f472703295d98b
Change author
degasus
Change description
Merge branch 'master' into tev-fixes3

Conflicts:
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp