diff options
| author | unknown <katisx1@citromail.hu> | 2018-01-15 18:20:53 +0100 | 
|---|---|---|
| committer | unknown <katisx1@citromail.hu> | 2018-01-15 18:20:53 +0100 | 
| commit | a4f5ccbf0a834fa231ff584ad333a58be71f058f (patch) | |
| tree | 8b435bd331dd2350bbb24bc4835dce65e4af96e2 /src/yuzu/configuration | |
| parent | 8d968780c19bed7fb260787c26ee908541c5934c (diff) | |
Clanggit rebase -i fixes
Diffstat (limited to 'src/yuzu/configuration')
| -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  const std::array<std::array<int, 5>, Settings::NativeAnalog::NumAnalogs> Config::default_analogs{{      { -        Qt::Key_Up, -        Qt::Key_Down, -        Qt::Key_Left, -        Qt::Key_Right, -        Qt::Key_D, +        Qt::Key_Up, Qt::Key_Down, Qt::Key_Left, Qt::Key_Right, Qt::Key_D,      },      { -        Qt::Key_I, -        Qt::Key_K, -        Qt::Key_J, -        Qt::Key_L, -        Qt::Key_D, +        Qt::Key_I, Qt::Key_K, Qt::Key_J, Qt::Key_L, Qt::Key_D,      },  }}; | 
