Leahnaya/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-03-24 11:05:37 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
9a6f28fce4
dolphin/Source/Core/Core
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
..
Src Merge branch 'wiimote-netplay' 2013-09-22 14:27:52 -04:00
CMakeLists.txt Use the POLARSSL_LIBRARY variable to set the link library. This fixes a 2013-09-11 22:09:49 -05:00
Core.vcxproj Merge branch 'master' into wii-network 2013-08-23 00:51:12 +12:00
Core.vcxproj.filters Merge branch 'master' into wii-network 2013-08-23 00:51:12 +12:00