degasus 702198f39b 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

2013-04-08 15:57:51 +02:00

..

Src

Merge branch 'master' into primitive_restart

2013-04-08 15:57:51 +02:00

CMakeLists.txt

Merge branch 'master' into perfqueries.

2013-03-01 01:07:34 +01:00

OpenCL.rules

Meta:

2010-06-02 18:00:22 +00:00

VideoCommon.vcxproj

Merge branch 'master' into perfqueries.

2013-03-01 01:07:34 +01:00

VideoCommon.vcxproj.filters

D3D11: Port perf queries code to the PerfQueryBase interface.

2013-03-01 19:30:37 +01:00