diff options
| author | ayuanx <ayuanx@gmail.com> | 2010-01-29 04:42:19 +0000 |
|---|---|---|
| committer | ayuanx <ayuanx@gmail.com> | 2010-01-29 04:42:19 +0000 |
| commit | fdaa0e8d4cd0801ba94f711d2a8c37f1211f37da (patch) | |
| tree | 451e51dd01d44f4d9dc9ad586073bd70042172aa /Source/Core/InputCommon/Src/SConscript | |
| parent | f9dd509459630e2f933bcf04dcea59b3e031f05d (diff) | |
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
Diffstat (limited to 'Source/Core/InputCommon/Src/SConscript')
| -rw-r--r-- | Source/Core/InputCommon/Src/SConscript | 2 |
1 files changed, 1 insertions, 1 deletions
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']: |