Information for buffer_storage-4.0-572

Version
4.0-572
Branch
buffer_storage
Date
9 years, 3 months ago
Windows x64 Windows x86 Mac OS X Android
Commit
8d8b0fc884367bc4d433d698a790ef5badee6957
Change author
Ryan Houdek
Change description 
Merge branch 'master' into buffer_storage

Conflicts:
	Source/Core/VideoBackends/OGL/Src/Render.cpp
	Source/Core/VideoCommon/Src/DriverDetails.cpp
	Source/Core/VideoCommon/Src/DriverDetails.h