Version
4.0-511
Branch
master
Date
5 years, 10 months ago
Windows x64 Windows x86 Android Ubuntu 13.04 Mac OS X
Commit
42619c1d2dfdd5c41e66049397e803b9d65e0283
Change author
degasus
Change description
Merge branch 'ogl-tex2d'

Conflicts:
	Source/Core/VideoBackends/OGL/Src/TextureConverter.cpp