Version
3.5-1222
Branch
tev_fixes
Date
10 years, 11 months ago
Windows x64 Windows x86 Mac OS X
Commit
b7a93ccd9021706fc84501cfd25fce3169b6bbc3
Change author
NeoBrainX
Change description
Merge 'master' into tev_fixes.

Conflicts:
	Source/Core/Common/Src/LinearDiskCache.h
	Source/Core/VideoCommon/Src/BPMemory.h
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp