Merge branch 'master' into wii-network

Conflicts:
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
	Source/VSProps/Dolphin.Win32.props
	Source/VSProps/Dolphin.x64.props

1 files changed, 0 insertions, 48 deletions

diff --git a/Source/Core/VideoCommon/SConscript b/Source/Core/VideoCommon/SConscript
deleted file mode 100644
index 5499f422db..0000000000
--- a/Source/Core/VideoCommon/SConscript
+++ /dev/null
@@ -1,48 +0,0 @@
-# -*- python -*-
-
-Import('env')
-
-files = [
-	'Src/BPFunctions.cpp',
-	'Src/BPMemory.cpp',
-	'Src/BPStructs.cpp',
-	'Src/CPMemory.cpp',
-	'Src/CommandProcessor.cpp',
-	'Src/DLCache.cpp',
-	'Src/Debugger.cpp',
-	'Src/Fifo.cpp',
-	'Src/FramebufferManagerBase.cpp',
-	'Src/HiresTextures.cpp',
-	'Src/ImageWrite.cpp',
-	'Src/IndexGenerator.cpp',
-	'Src/LightingShaderGen.cpp',
-	'Src/MainBase.cpp',
-	'Src/OnScreenDisplay.cpp',
-	'Src/OpcodeDecoding.cpp',
-	'Src/OpenCL.cpp',
-	'Src/OpenCL/OCLTextureDecoder.cpp',
-	'Src/PixelEngine.cpp',
-	'Src/PixelShaderGen.cpp',
-	'Src/PixelShaderManager.cpp',
-	'Src/RenderBase.cpp',
-	'Src/Statistics.cpp',
-	'Src/TextureCacheBase.cpp',
-	'Src/TextureConversionShader.cpp',
-	'Src/TextureDecoder.cpp',
-	'Src/VertexLoader.cpp',
-	'Src/VertexLoaderManager.cpp',
-	'Src/VertexLoader_Color.cpp',
-	'Src/VertexLoader_Normal.cpp',
-	'Src/VertexLoader_Position.cpp',
-	'Src/VertexLoader_TextCoord.cpp',
-	'Src/VertexManagerBase.cpp',
-	'Src/VertexShaderGen.cpp',
-	'Src/VertexShaderManager.cpp',
-	'Src/VideoConfig.cpp',
-	'Src/VideoState.cpp',
-	'Src/XFMemory.cpp',
-	'Src/XFStructs.cpp',
-	'Src/memcpy_amd.cpp',
-	]
-
-env['LIBS'] += env.StaticLibrary('videocommon', files)