diff options
| author | 2018-01-15 18:20:53 +0100 | |
|---|---|---|
| committer | 2018-01-15 18:20:53 +0100 | |
| commit | a4f5ccbf0a834fa231ff584ad333a58be71f058f (patch) | |
| tree | 8b435bd331dd2350bbb24bc4835dce65e4af96e2 /src | |
| parent | Clang format (diff) | |
| download | yuzu-a4f5ccbf0a834fa231ff584ad333a58be71f058f.tar.gz yuzu-a4f5ccbf0a834fa231ff584ad333a58be71f058f.tar.xz yuzu-a4f5ccbf0a834fa231ff584ad333a58be71f058f.zip | |
Clanggit rebase -i fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/configuration/config.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index 314fc2779..6e33337c2 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp | |||
| @@ -24,18 +24,10 @@ const std::array<int, Settings::NativeButton::NumButtons> Config::default_button | |||
| 24 | 24 | ||
| 25 | const std::array<std::array<int, 5>, Settings::NativeAnalog::NumAnalogs> Config::default_analogs{{ | 25 | const std::array<std::array<int, 5>, Settings::NativeAnalog::NumAnalogs> Config::default_analogs{{ |
| 26 | { | 26 | { |
| 27 | Qt::Key_Up, | 27 | Qt::Key_Up, Qt::Key_Down, Qt::Key_Left, Qt::Key_Right, Qt::Key_D, |
| 28 | Qt::Key_Down, | ||
| 29 | Qt::Key_Left, | ||
| 30 | Qt::Key_Right, | ||
| 31 | Qt::Key_D, | ||
| 32 | }, | 28 | }, |
| 33 | { | 29 | { |
| 34 | Qt::Key_I, | 30 | Qt::Key_I, Qt::Key_K, Qt::Key_J, Qt::Key_L, Qt::Key_D, |
| 35 | Qt::Key_K, | ||
| 36 | Qt::Key_J, | ||
| 37 | Qt::Key_L, | ||
| 38 | Qt::Key_D, | ||
| 39 | }, | 31 | }, |
| 40 | }}; | 32 | }}; |
| 41 | 33 | ||