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	openssl: enable ec/dsa and rearrange files in Externals a bit.	2012-02-27 00:51:50 -08:00
CodeGen_DebugFast.props	openssl: enable ec/dsa and rearrange files in Externals a bit.	2012-02-27 00:51:50 -08:00
CodeGen_Release.props	I am very picky about my VS files... :D	2012-03-21 14:53:50 -07:00
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	vs2010:	2011-02-08 04:03:48 +00:00
WXWOverrides.props	forgot to add wxwidgets3 vcxproj to git, since it was masked by gitignore...	2012-03-18 03:30:03 -07:00