diff options
author | bunnei <bunneidev@gmail.com> | 2019-04-09 18:08:30 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-09 18:08:30 -0400 |
commit | 1a3098f11a21bd102c63f2bc4ebb01789d3fd93e (patch) | |
tree | 8f977d1f87ff108edaf285ee1569cdff64d747d2 /src/yuzu/ui_settings.cpp | |
parent | 71182643f76a136d755698f0eb7efef5f7d5d6cc (diff) | |
parent | 57a4a2ae0fc35906723ffc9f788f3cf7dd9c4ba5 (diff) |
Merge pull request #2132 from FearlessTobi/port-4437
Port citra-emu/citra#4437: "citra-qt: Make hotkeys configurable via the GUI (Attempt 2)"
Diffstat (limited to 'src/yuzu/ui_settings.cpp')
-rw-r--r-- | src/yuzu/ui_settings.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/yuzu/ui_settings.cpp b/src/yuzu/ui_settings.cpp index a314493fc..4bdc302e0 100644 --- a/src/yuzu/ui_settings.cpp +++ b/src/yuzu/ui_settings.cpp @@ -12,5 +12,4 @@ const Themes themes{{ }}; Values values = {}; - } // namespace UISettings |