mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-06 07:06:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
ce49964dfe
dolphin/Source/VSProps
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
..
Base.props
CodeGen_Debug.props
CodeGen_DebugFast.props
CodeGen_Release.props
Dolphin.Win32.props Merge branch 'master' into wii-network 2013-08-16 19:17:07 +12:00
Dolphin.x64.props Merge branch 'master' into wii-network 2013-08-16 19:17:07 +12:00
PrecompiledHeader.props
WXWOverrides.props