Version
3.5-533
Branch
tev_fixes
Date
11 years ago
Windows x64 Windows x86 Mac OS X
Commit
7486d43f4c3006b246ce4d15ee395966e5fa3dbf
Change author
NeoBrainX
Change description
Merge 'master' into tev_fixes.

Conflicts:
	Source/Plugins/Plugin_VideoDX9/Src/Render.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp