Matthew Parlane e0c9a1fd09 Merge branch 'master' into wii-network ... Conflicts: Source/Core/Common/Src/CommonPaths.h Source/Core/Core/CMakeLists.txt Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp		2013-01-01 23:28:46 +13:00
..
Sys	Merge branch 'master' into wii-network	2013-01-01 23:28:46 +13:00
User	Gameini database updates/additions for: TMNT3, Mystic Heroes, BEACH SPIKERS, Fantastic Four, King Arthur, I-Ninja, FFCC Echoes of Time, Just Dance, Disney Epic Mickey, Shark Tale, Pokemon Channel, Cars 2, Disney Epic Mickey 2: The Power of 2, THE LAST STORY.	2012-11-26 14:31:55 +02: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