dolphin

mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-25 07:21:14 +01:00

History

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