H3cJP/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-11-26 19:32:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
9754fda516
dolphin/Source
History
Matthew Parlane 9754fda516 Merge branch 'wii-usb' into temp merge branch 
Conflicts:
	Source/Core/Common/Src/Log.h
	Source/Core/Core/Core.vcxproj
	Source/Core/Core/Core.vcxproj.filters
	Source/VSProps/Dolphin.Win32.props
	Source/VSProps/Dolphin.x64.props
2013-01-11 23:07:12 +13:00
..
Core Merge branch 'wii-usb' into temp merge branch 2013-01-11 23:07:12 +13:00
DSPSpy
DSPTool
Plugins Revert 30dd9c2 e9d00bf db5f4c8 and bff0fae 2013-01-07 13:47:34 -06:00
TestSuite
UnitTests
VSProps Merge branch 'wii-usb' into temp merge branch 2013-01-11 23:07:12 +13:00
CMakeLists.txt
Dolphin_2010.sln