dolphin/Source/Plugins/Plugin_VideoOGL
NeoBrainX ca22872dae Merge 'master' into shader-uids-awesome.
Conflicts:
	Source/Core/VideoCommon/Src/LightingShaderGen.cpp
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp
	Source/Core/VideoCommon/Src/PixelShaderGen.h
	Source/Core/VideoCommon/Src/VertexShaderGen.cpp
2013-06-17 12:05:47 +02:00
..
Src Merge 'master' into shader-uids-awesome. 2013-06-17 12:05:47 +02:00
CMakeLists.txt [Android] Start of *working* GLES3 support. Needs to be able to compile in Windows still. 2013-06-11 08:33:56 -05:00
Plugin_VideoOGL.vcxproj Merge branch 'master' into GLSL-master 2013-03-06 15:59:29 +01:00
Plugin_VideoOGL.vcxproj.filters Merge branch 'master' into GLSL-master 2013-03-06 15:59:29 +01:00