dolphin/Source/VSProps
Matthew Parlane 9754fda516 Merge branch 'wii-usb' into temp merge branch
Conflicts:
	Source/Core/Common/Src/Log.h
	Source/Core/Core/Core.vcxproj
	Source/Core/Core/Core.vcxproj.filters
	Source/VSProps/Dolphin.Win32.props
	Source/VSProps/Dolphin.x64.props
2013-01-11 23:07:12 +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 Merge branch 'wii-usb' into temp merge branch 2013-01-11 23:07:12 +13:00
Dolphin.x64.props Merge branch 'wii-usb' into temp merge branch 2013-01-11 23:07:12 +13: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