piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 17:19:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into GLSL-master

Browse Source 
Conflicts:
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp
	Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
	Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
This commit is contained in:
Ryan Houdek
2013-03-15 11:19:52 -05:00
parent 84119a966b d63d7fde9e
commit 8c1091a21f
38 changed files with 384 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Externals/soundtouch/SoundTouch.vcxproj vendored
View File

@ -174,7 +174,7 @@
<CompileAs>Default</CompileAs>
</ClCompile>
<Lib>
<OutputFile>Win32\SoundTouch.lib</OutputFile>
<OutputFile>Win32\SoundTouchD.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<PostBuildEvent>