diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2016-06-24 22:38:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-24 22:38:28 +0200 |
| commit | cbd6fda5e33008f9889b35be6c508d3d37bc4731 (patch) | |
| tree | 0e307ed6729e4687de5f85ec3ae87afa699a6397 /Source/Android/jni/ButtonManager.cpp | |
| parent | b3302143879ea51ffe838ffc629aa88c4d9086c5 (diff) | |
| parent | 9e826940716c75cc8d9c54c695dda4cbe1b92ec0 (diff) | |
Merge pull request #3929 from spider-mario/android-button-manager
Fix configStrings in Android’s ButtonManager
Diffstat (limited to 'Source/Android/jni/ButtonManager.cpp')
| -rw-r--r-- | Source/Android/jni/ButtonManager.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Source/Android/jni/ButtonManager.cpp b/Source/Android/jni/ButtonManager.cpp index 7db0fe31ed..36d21684ce 100644 --- a/Source/Android/jni/ButtonManager.cpp +++ b/Source/Android/jni/ButtonManager.cpp @@ -23,9 +23,7 @@ std::vector<std::string> configStrings = { "WiimoteUp", "WiimoteDown", "WiimoteLeft", "WiimoteRight", "IRUp", "IRDown", "IRLeft", "IRRight", "IRForward", "IRBackward", "IRHide", "SwingUp", "SwingDown", "SwingLeft", "SwingRight", "SwingForward", "SwingBackward", "TiltForward", "TiltBackward", "TiltLeft", - "TiltRight", "TiltModifier" - "ShakeX", - "ShakeY", "ShakeZ", + "TiltRight", "TiltModifier", "ShakeX", "ShakeY", "ShakeZ", // Nunchuk "NunchukC", "NunchukZ", "NunchukUp", "NunchukDown", "NunchukLeft", "NunchukRight", "NunchukSwingUp", "NunchukSwingDown", "NunchukSwingLeft", "NunchukSwingRight", |