ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
dolphin/Source/Plugins
History
Ryan Houdek 8c1091a21f Merge branch 'master' into GLSL-master 
Conflicts:
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp
	Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
	Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
 		2013-03-15 11:19:52 -05:00
..
Plugin_VideoDX9 Merge branch 'master' into GLSL-master 2013-03-15 11:19:52 -05:00
Plugin_VideoDX11 Merge branch 'master' into GLSL-master 2013-03-15 11:19:52 -05:00
Plugin_VideoOGL Add a OSX version check to GLSL so if anyone running < OSX 10.7 gets a message instead of crashing when running the game. Turn off DEBUG_GLSL. 2013-03-14 15:25:41 -05:00
Plugin_VideoSoftware Merge branch 'master' into GLSL-master 2013-03-15 11:19:52 -05:00
CMakeLists.txt Initial push of GLES and GLUtil file breakup. 2012-12-17 14:54:20 -06:00