From fdaa0e8d4cd0801ba94f711d2a8c37f1211f37da Mon Sep 17 00:00:00 2001
From: ayuanx <ayuanx@gmail.com>
Date: Fri, 29 Jan 2010 04:42:19 +0000
Subject: Fixes Issue 2164

Conflicts are due to same file name when omitting full path

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4982 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/InputCommon/Src/SConscript | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Source/Core/InputCommon/Src/SConscript')

diff --git a/Source/Core/InputCommon/Src/SConscript b/Source/Core/InputCommon/Src/SConscript
index 13ee418d0d..1df5cf64a3 100644
--- a/Source/Core/InputCommon/Src/SConscript
+++ b/Source/Core/InputCommon/Src/SConscript
@@ -6,7 +6,7 @@ files = [
 	'Configuration.cpp',
 	'EventHandler.cpp',
 	'InputCommon.cpp',
-	'SDL.cpp',
+	'SDL_Util.cpp',
 	]
 
 if env['HAVE_X11']:
-- 
cgit v1.2.3