dolphin-emulator/Source/Core/VideoCommon
degasus e0ffdda26e Merge branch 'immediate-removal' into GLSL-master
Conflicts:
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp
	Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp

immediate-removal is a new created branch seperated from master but reverted the revert of immediate-removal
so we get less conflicts by merging
2013-01-24 16:58:28 +01:00
..
Src Merge branch 'immediate-removal' into GLSL-master 2013-01-24 16:58:28 +01:00
CMakeLists.txt Implement a simple benchmarking mode which logs FPS to a file 2012-10-04 05:41:02 +02:00
OpenCL.rules Meta: 2010-06-02 18:00:22 +00:00
VideoCommon.vcxproj merge relevant changes from bc61dbdf58a8 in otu0001-desync-fix clone 2012-10-23 02:10:49 -04:00
VideoCommon.vcxproj.filters Implement a simple benchmarking mode which logs FPS to a file 2012-10-04 05:41:02 +02:00