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
..
Sys	Changed the HLE system to allow it to hook the beginning, the end or replace the entire function without changing the GC memory. Fixes Kirby's Return to Dreamland.	2012-12-28 14:26:46 +11:00
User	Merge branch 'master' into GLSL-master	2013-03-15 11:19:52 -05:00
cpack_package_description.txt	Dolphin 3.5 release.	2012-12-24 21:29:24 +01:00
license.txt	Copy licence.txt into Data directory to be sure it gets copied to the Binary/ directory on build.	2009-10-10 09:57:18 +00:00