mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-11 03:45:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
e0c9a1fd09
dolphin/Source/VSProps
History
Matthew Parlane e0c9a1fd09 Merge branch 'master' into wii-network 
Conflicts:
	Source/Core/Common/Src/CommonPaths.h
	Source/Core/Core/CMakeLists.txt
	Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp
2013-01-01 23:28:46 +13:00
..
Base.props Add the resource include in only one place for all builds. 2012-12-16 23:39:05 -06:00
CodeGen_Debug.props
CodeGen_DebugFast.props
CodeGen_Release.props
Dolphin.Win32.props Got overzealous. We aren't removing CG quite yet with this branch. 2012-12-26 00:41:25 -06:00
Dolphin.x64.props Got overzealous. We aren't removing CG quite yet with this branch. 2012-12-26 00:41:25 -06:00
PrecompiledHeader.props
WXWOverrides.props