ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
10,708 Commits 6 Branches 12 Tags 1.3 GiB
Commit Graph

4 Commits

Author SHA1 Message Date
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
Ryan Houdek 532fdada96 Adds the Wii Korean settings file. It was handled in the wii-network branch in rev c42a6f156e. Master handles the settings files differently. Until wii-network merges in to master, this closes issue 5642. 2012-12-14 11:37:26 -06:00
Matthew Parlane 53b624c381 No longer need settings files. 2012-01-31 17:03:04 +13:00
Shawn Hoffman ffe1a671ea added files and svn ignore settings to the new file structure 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1069 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-11-04 21:20:12 +00:00