dolphin

mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-26 05:53:39 +01:00

History

Rachel Bryk f3469c16a5 Merge branch 'wiimote-netplay'

Conflicts:
	Source/Core/Core/Src/NetPlayClient.cpp
	Source/Core/Core/Src/NetPlayClient.h
	Source/Core/Core/Src/NetPlayProto.h
	Source/Core/Core/Src/NetPlayServer.cpp
	Source/Core/Core/Src/NetPlayServer.h
	Source/Core/DolphinWX/Src/NetWindow.cpp
	Source/Core/DolphinWX/Src/NetWindow.h

2013-09-22 14:27:52 -04:00

resources

Use the new Dolphin icon

2013-09-22 16:00:39 +02:00

Src

Merge branch 'wiimote-netplay'

2013-09-22 14:27:52 -04:00

CMakeLists.txt

Move global gameinis from User to Sys. Get rid of SHARED_USER.

2013-09-14 06:08:30 +02:00

Dolphin.vcxproj

Ship vcomp100.dll with Dolphin