Matthew Parlane b6e054a2be Merge branch 'master' into wii-network ... Conflicts: Source/Core/Core/Core.vcxproj Source/Core/Core/Core.vcxproj.filters Source/Core/Core/Src/CoreParameter.cpp Source/Core/DolphinWX/Dolphin.vcxproj Source/Core/DolphinWX/Dolphin.vcxproj.filters		2013-08-23 00:51:12 +12:00
..
Sys	Merge branch 'master' into wii-network	2013-03-27 13:19:23 +11:00
User	Gameini database update. Fix Metroid Prime 3: Corruption settings that got deleted by the clean up of revision e5f4586356. Fix/clean up various stuff that showed up in the process of searching for other regressions (there weren't any).	2013-08-20 17:21:57 +03: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