Pierre Bourdon fdff4cb1ff Merge branch 'master' into wii-network ... Conflicts: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp Source/VSProps/Dolphin.Win32.props Source/VSProps/Dolphin.x64.props		2012-05-16 09:27:37 +02:00
..
Sys	No longer need settings files.	2012-01-31 17:03:04 +13:00
User	Gameini database update for Monster Hunter Tri, WarioWare: Smooth Moves, Mario Party 9, Pandora's Tower,	2012-04-13 18:52:49 +03: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