diff options
| author | Arisotura <thetotalworm@gmail.com> | 2020-12-04 18:28:15 +0100 |
|---|---|---|
| committer | Arisotura <thetotalworm@gmail.com> | 2020-12-04 18:28:15 +0100 |
| commit | 129018a6626cbec915ef73484c51c9d07af8e8b9 (patch) | |
| tree | 8e5712bd241319731f7b6ade3363cefe845e3a5e /src/frontend/qt_sdl/PlatformConfig.cpp | |
| parent | 6aad429383015a0ac135b081931ae9c5876a7ad0 (diff) | |
| parent | 42e083960e52cce31589714dcc7fab8e173efb81 (diff) | |
Merge remote-tracking branch 'remotes/origin/master' into dsi_camera
Diffstat (limited to 'src/frontend/qt_sdl/PlatformConfig.cpp')
| -rw-r--r-- | src/frontend/qt_sdl/PlatformConfig.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/frontend/qt_sdl/PlatformConfig.cpp b/src/frontend/qt_sdl/PlatformConfig.cpp index c2d40c4..9861662 100644 --- a/src/frontend/qt_sdl/PlatformConfig.cpp +++ b/src/frontend/qt_sdl/PlatformConfig.cpp @@ -120,7 +120,7 @@ ConfigEntry PlatformConfigFile[] = {"HKJoy_Reset", 0, &HKJoyMapping[HK_Reset], -1, NULL, 0}, {"HKJoy_FastForward", 0, &HKJoyMapping[HK_FastForward], -1, NULL, 0}, {"HKJoy_FastForwardToggle", 0, &HKJoyMapping[HK_FastForwardToggle], -1, NULL, 0}, - {"HKJoy_FastForwardToggle", 0, &HKJoyMapping[HK_FullscreenToggle], -1, NULL, 0}, + {"HKJoy_FullscreenToggle", 0, &HKJoyMapping[HK_FullscreenToggle], -1, NULL, 0}, {"HKJoy_SolarSensorDecrease", 0, &HKJoyMapping[HK_SolarSensorDecrease], -1, NULL, 0}, {"HKJoy_SolarSensorIncrease", 0, &HKJoyMapping[HK_SolarSensorIncrease], -1, NULL, 0}, |