ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
dolphin/Source/Core
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
..
AudioCommon ARM Support without GLSL 2013-02-26 13:49:00 -06:00
Common Merge branch 'master' into GLSL-master 2013-03-15 11:19:52 -05:00
Core Merge branch 'master' into GLSL-master 2013-03-15 11:19:52 -05:00
DiscIO Fix a potential memory leak in function DecompressBlobToFile in CompressedBlob.cpp 2013-03-07 10:59:50 -05:00
DolphinWX Merge branch 'master' into GLSL-master 2013-03-15 11:19:52 -05:00
InputCommon Merge branch 'master' into windows-unicode 2013-03-02 15:33:32 -06:00
VideoCommon Merge branch 'master' into GLSL-master 2013-03-15 11:19:52 -05:00
CMakeLists.txt Merge UI related projects into the main DolphinWX project. 2011-02-11 21:37:52 +00:00