Shawn Hoffman f7423a0a4f Merge branch 'master' into wxw3-update ... Conflicts: Source/Core/DolphinWX/Src/LogWindow.cpp		2012-03-22 17:57:38 -07:00
..
Base.props	vs2010: add debugfast configs for all projects except wxw...will do those soon.	2011-02-10 02:53:08 +00:00
CodeGen_Debug.props	vs2010: make sure minimal rebuild is turned off	2011-03-24 04:26:21 +00:00
CodeGen_DebugFast.props	vs2010: make sure minimal rebuild is turned off	2011-03-24 04:26:21 +00:00
CodeGen_Release.props	I am very picky about my VS files... :D	2012-03-21 14:53:50 -07:00
Dolphin.Win32.props	update portaudio to stable_v19_20111121 and fix linker warnings	2012-03-18 07:50:37 -07:00
Dolphin.x64.props	update portaudio to stable_v19_20111121 and fix linker warnings	2012-03-18 07:50:37 -07: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