dolphin/Source/Plugins/Plugin_VideoDX11
NeoBrainX 5e6b712651 Merge 'master' into shader-uids-awesome.
Conflicts:
	Source/Core/VideoCommon/Src/BPMemory.h
	Source/Core/VideoCommon/Src/LightingShaderGen.cpp
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp
	Source/Core/VideoCommon/Src/PixelShaderGen.h
	Source/Core/VideoCommon/Src/PixelShaderManager.cpp
	Source/Core/VideoCommon/Src/VertexShaderGen.cpp
	Source/Core/VideoCommon/Src/VertexShaderGen.h
2013-04-25 14:05:54 +02:00
..
Src Merge 'master' into shader-uids-awesome. 2013-04-25 14:05:54 +02:00
Plugin_VideoDX11.vcxproj D3D11: Port perf queries code to the PerfQueryBase interface. 2013-03-01 19:30:37 +01:00
Plugin_VideoDX11.vcxproj.filters D3D11: Port perf queries code to the PerfQueryBase interface. 2013-03-01 19:30:37 +01:00