H3cJP/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-01-01 18:25:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
9de7611ff9
dolphin/Data
History
Matthew Parlane 9de7611ff9 Merge branch 'master' into wii-network 
Conflicts:
	CMakeLists.txt
	Source/Core/Core/Core.vcxproj
	Source/Core/DolphinWX/Dolphin.vcxproj
	Source/Core/DolphinWX/Dolphin.vcxproj.filters
	Source/Dolphin_2010.sln
	Source/VSProps/Dolphin.Win32.props
	Source/VSProps/Dolphin.x64.props
2013-08-16 19:17:07 +12:00
..
Sys Merge branch 'master' into wii-network 2013-03-27 13:19:23 +11:00
User Fix for my previous commit. 2013-07-16 14:44:03 +03:00
cpack_package_description.txt
license.txt