Version
3.5-1205
Branch
primitive_restart
Date
10 years ago
Windows x64 Windows x86 Mac OS X
Commit
702198f39b4eb71a068c20c9969bd86856fa85ae
Change author
degasus
Change description
Merge branch 'master' into primitive_restart

Conflicts:
	Source/Core/VideoCommon/Src/VideoConfig.h
	Source/Plugins/Plugin_VideoDX9/Src/main.cpp
	Source/Plugins/Plugin_VideoOGL/Src/Render.cpp