dolphin/Data
Matthew Parlane ca4ea817e0 Merge branch 'master' into wii-network
Conflicts:
	Source/Core/Common/Src/CommonPaths.h
	Source/Core/Common/Src/FileUtil.h
	Source/Core/Core/Src/HLE/HLE.cpp
	Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.cpp
2013-01-26 21:46:12 +13:00
..
Sys Merge branch 'master' into wii-network 2013-01-26 21:46:12 +13:00
User Merge branch 'external-theme' 2013-01-16 19:00:19 -06: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