Information for GLSL-master-3.5-1022

Version
3.5-1022
Branch
GLSL-master
Date
10 years, 1 month ago
Mac OS X
Commit
8c1091a21f19ec5ffcb7b4a4ca4cf87e1e19991f
Change author
Ryan Houdek
Change description 
Merge branch 'master' into GLSL-master

Conflicts:
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp
	Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
	Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp