dolphin/Source
Matthew Parlane 9de7611ff9 Merge branch 'master' into wii-network
Conflicts:
	CMakeLists.txt
	Source/Core/Core/Core.vcxproj
	Source/Core/DolphinWX/Dolphin.vcxproj
	Source/Core/DolphinWX/Dolphin.vcxproj.filters
	Source/Dolphin_2010.sln
	Source/VSProps/Dolphin.Win32.props
	Source/VSProps/Dolphin.x64.props
2013-08-16 19:17:07 +12:00
..
Android Revert "[Android] Use equals to compare GL version string instead of contains. This should really be some sort of sscanf check so we can check if version > 3.0 but we'll worry about that when OpenGL ES 4.0 is released." 2013-07-25 19:35:01 +00:00
Core Merge branch 'master' into wii-network 2013-08-16 19:17:07 +12:00
DSPSpy
DSPTool Buildfix for dsptool. 2013-05-21 20:30:09 -04:00
Plugins Fix an issue where TextureConverter.cpp was creating a renderbuffer with the wrong format. Also a few minor shader issues where they were using integers in place of floats. 2013-07-25 18:39:00 +00:00
TestSuite clear cg from project files 2013-02-27 10:55:25 +01:00
UnitTests Adding unit test project to VS solution 2013-05-22 03:29:58 +02:00
VSProps Merge branch 'master' into wii-network 2013-08-16 19:17:07 +12:00
CMakeLists.txt
Dolphin_2010.sln Merge branch 'master' into wii-network 2013-08-16 19:17:07 +12:00