degasus 382be2aabd Merge branch 'master' into GLSL-master ...

Conflicts:
	.gitignore

2013-03-12 11:28:56 +01:00

..

Src

Merge branch 'master' into GLSL-master

2013-03-12 11:28:56 +01: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