Merge branch 'master' into wii-network

Browse source

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

...

This commit is contained in:

Matthew Parlane 2013-01-01 23:28:46 +13:00

parent fe1fdc5e7b c728ef2cd3

commit e0c9a1fd09

434 changed files with 39654 additions and 27613 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

BIN

Data/Sys/Wii/setting-kor.txt Normal file

View file

Binary file not shown.