Version
4.0-606
Branch
GLExtensions
Date
10 years, 4 months ago
Windows x64 Windows x86 Mac OS X Android
Commit
6903a26b5403326619b62d5d9d7ead35493a5c82
Change author
Ryan Houdek
Change description
Merge branch 'master' into GLExtensions

Conflicts:
	CMakeLists.txt
	Source/Core/VideoBackends/OGL/GLUtil.h
	Source/Core/VideoBackends/OGL/Render.cpp