diff options
| author | Alex Ong <the.onga@gmail.com> | 2019-01-04 19:43:45 +1100 |
|---|---|---|
| committer | Alex Ong <the.onga@gmail.com> | 2019-01-04 19:43:45 +1100 |
| commit | 2bb2977c133646c4e056960e72029270d77cc1eb (patch) | |
| tree | 235d491f992121ac1716c5bf2fafb80983748576 /quantum/keymap_common.c | |
| parent | a55c838961c89097ab849ed6cb1f261791e6b9b4 (diff) | |
| parent | 47c91fc7f75ae0a477e55b687aa0fc30da0a283c (diff) | |
| download | qmk_firmware-2bb2977c133646c4e056960e72029270d77cc1eb.tar.gz qmk_firmware-2bb2977c133646c4e056960e72029270d77cc1eb.zip | |
Merge branch 'master' into debounce_refactor
# Conflicts:
# tmk_core/common/keyboard.c
Diffstat (limited to 'quantum/keymap_common.c')
| -rw-r--r-- | quantum/keymap_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c index 50af15d62..f6c8b70d2 100644 --- a/quantum/keymap_common.c +++ b/quantum/keymap_common.c | |||
| @@ -64,7 +64,7 @@ action_t action_for_key(uint8_t layer, keypos_t key) | |||
| 64 | case KC_SYSTEM_POWER ... KC_SYSTEM_WAKE: | 64 | case KC_SYSTEM_POWER ... KC_SYSTEM_WAKE: |
| 65 | action.code = ACTION_USAGE_SYSTEM(KEYCODE2SYSTEM(keycode)); | 65 | action.code = ACTION_USAGE_SYSTEM(KEYCODE2SYSTEM(keycode)); |
| 66 | break; | 66 | break; |
| 67 | case KC_AUDIO_MUTE ... KC_MEDIA_REWIND: | 67 | case KC_AUDIO_MUTE ... KC_BRIGHTNESS_DOWN: |
| 68 | action.code = ACTION_USAGE_CONSUMER(KEYCODE2CONSUMER(keycode)); | 68 | action.code = ACTION_USAGE_CONSUMER(KEYCODE2CONSUMER(keycode)); |
| 69 | break; | 69 | break; |
| 70 | case KC_MS_UP ... KC_MS_ACCEL2: | 70 | case KC_MS_UP ... KC_MS_ACCEL2: |