dolphin/Source
Matthew Parlane 934e150596 Merge branch 'master' into wii-network
Conflicts:
	Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp
	Source/Core/Core/Src/ConfigManager.cpp
	Source/Core/Core/Src/HLE/HLE_OS.h
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.h
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.h
2013-04-24 00:48:00 +12:00
..
Android Fix making the config directory so copying over assets won't fail. 2013-04-20 12:11:58 -05:00
Core Merge branch 'master' into wii-network 2013-04-24 00:48:00 +12:00
DSPSpy
DSPTool New license header introduced for DiscIO, AudioCommon, InputCommon, VideoCommon, and Common projects. 2013-04-17 23:09:55 -04:00
Plugins Fix a bunch of random typos in comments and logging. 2013-04-19 09:21:45 -04:00
TestSuite clear cg from project files 2013-02-27 10:55:25 +01:00
UnitTests Remove scons-related files 2012-03-25 12:55:02 -07:00
VSProps Merge branch 'master' into wii-network 2013-03-27 13:19:23 +11:00
CMakeLists.txt
Dolphin_2010.sln Added audio time stretching by using the SoundTouch library. 2013-01-09 22:57:32 +11:00