Merge branch 'master' into wxw3-update

Conflicts:
	Source/Core/DolphinWX/Src/LogWindow.cpp
This commit is contained in:
Shawn Hoffman
2012-03-22 17:57:38 -07:00
186 changed files with 1193 additions and 483 deletions

View File

@ -19,7 +19,6 @@
<FunctionLevelLinking>false</FunctionLevelLinking>
<PreprocessorDefinitions>_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
<FloatingPointModel>Fast</FloatingPointModel>
</ClCompile>
<Link>
<OptimizeReferences>true</OptimizeReferences>