Merge branch 'master' into android-new-control-input-overlay

Conflicts:
	Source/Core/DolphinWX/Src/Android/ButtonManager.h

1 files changed, 2 insertions, 2 deletions

diff --git a/Source/Core/VideoCommon/Src/Debugger.cpp b/Source/Core/VideoCommon/Src/Debugger.cpp
index 85a9ba61f6..321fed8291 100644
--- a/Source/Core/VideoCommon/Src/Debugger.cpp
+++ b/Source/Core/VideoCommon/Src/Debugger.cpp
@@ -108,7 +108,7 @@ void GFXDebuggerBase::DumpPixelShader(const char* path)
 	}
 
 	File::CreateEmptyFile(filename);
-	File::WriteStringToFile(true, output, filename);
+	File::WriteStringToFile(output, filename);
 }
 
 void GFXDebuggerBase::DumpVertexShader(const char* path)
@@ -117,7 +117,7 @@ void GFXDebuggerBase::DumpVertexShader(const char* path)
 	sprintf(filename, "%sdump_vs.txt", path);
 
 	File::CreateEmptyFile(filename);
-///	File::WriteStringToFile(true, GenerateVertexShaderCode(g_nativeVertexFmt->m_components, g_ActiveConfig.backend_info.APIType), filename);
+///	File::WriteStringToFile(GenerateVertexShaderCode(g_nativeVertexFmt->m_components, g_ActiveConfig.backend_info.APIType), filename);
 }
 
 void GFXDebuggerBase::DumpPixelShaderConstants(const char* path)