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

Add UPnP support.

2013-07-09 18:08:43 -04: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

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

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