diff options
| author | Matthew Parlane <parlane@gmail.com> | 2013-01-26 21:46:12 +1300 |
|---|---|---|
| committer | Matthew Parlane <parlane@gmail.com> | 2013-01-26 21:46:12 +1300 |
| commit | ca4ea817e094c0725b526184f41f41e506a68637 (patch) | |
| tree | 7a93c40339fd30444383ed0984cbfcb061a10bf7 /Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp | |
| parent | 1083884b8b9566a05dd03e03f978ec3ece58f4dd (diff) | |
| parent | 2f28d938cf640390cd8979c6104f3dbe8795e1e6 (diff) | |
Merge branch 'master' into wii-network
Conflicts:
Source/Core/Common/Src/CommonPaths.h
Source/Core/Common/Src/FileUtil.h
Source/Core/Core/Src/HLE/HLE.cpp
Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.cpp
Diffstat (limited to 'Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp')
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp b/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp index fa30ba5c62..dad0c6bbf8 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp @@ -115,7 +115,6 @@ KeyboardMouse::Key::Key(Display* const display, KeyCode keycode, const char* key ControlState KeyboardMouse::Key::GetState() const { - const KeyCode shift = XKeysymToKeycode(m_display, XK_Shift_L); return (m_keyboard[m_keycode / 8] & (1 << (m_keycode % 8))) != 0; } |