Yaya48/dolphin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
934e150596c30d7d1f74c208f90d741b23456e21
dolphin/Source/Core
T
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
..
AudioCommon
Fix a bunch of random typos in comments and logging.
2013-04-19 09:21:45 -04:00
Common
Merge branch 'master' into wii-network
2013-04-24 00:48:00 +12:00
Core
Merge branch 'master' into wii-network
2013-04-24 00:48:00 +12:00
DiscIO
Fix a bunch of random typos in comments and logging.
2013-04-19 09:21:45 -04:00
DolphinWX
Add Swedish translations.
2013-04-23 06:44:33 -05:00
InputCommon
Fix a bunch of random typos in comments and logging.
2013-04-19 09:21:45 -04:00
VideoCommon
Fix a bunch of random typos in comments and logging.
2013-04-19 09:21:45 -04:00
CMakeLists.txt
Merge UI related projects into the main DolphinWX project.
2011-02-11 21:37:52 +00:00