ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
dolphin/Source/Core/DolphinWX
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
resources Use the new Dolphin icon 2013-09-22 16:00:39 +02: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 2013-09-22 16:00:56 +02:00
Dolphin.vcxproj.filters Merge branch 'master' into wii-network 2013-08-23 00:51:12 +12:00
Dolphin.vcxproj.user vs2010: make -d be passed to debugfast builds launched from vs 2011-02-25 04:00:16 +00:00
DolphinWX.rc Define the icon for "dolphin". The IDI_ICON1 seems to be preempted by the wx resource. This one does not. 2012-12-17 08:33:42 -06:00
Info.plist.in Pull in translations from Transifex. 2013-09-21 11:24:33 -05:00
resource.h set svn:eol-style=native for **.h 2008-12-08 04:46:09 +00:00