diff options
| author | tmk <nobody@nowhere> | 2014-11-24 13:50:33 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2014-11-24 13:50:33 +0900 |
| commit | 363950982a291c3bfa03ac6362061b1d37dc06b0 (patch) | |
| tree | c46fc53fe00137ced3c8edd3d0766ee844f77516 /common/action.c | |
| parent | eb90ed6238426db9367e294abfaefb5de07564f5 (diff) | |
| parent | 60096e11c77980ca6b54674c5b68248e8aa15d8d (diff) | |
| download | qmk_firmware-363950982a291c3bfa03ac6362061b1d37dc06b0.tar.gz qmk_firmware-363950982a291c3bfa03ac6362061b1d37dc06b0.zip | |
Merge branch 'rn42' into merge_rn42
Conflicts:
.gitignore
common.mk
common/debug_config.h
common/print.h
Diffstat (limited to 'common/action.c')
| -rw-r--r-- | common/action.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/action.c b/common/action.c index 83bc8a618..ec8eeae7b 100644 --- a/common/action.c +++ b/common/action.c | |||
| @@ -509,7 +509,7 @@ void clear_keyboard_but_mods(void) | |||
| 509 | #endif | 509 | #endif |
| 510 | } | 510 | } |
| 511 | 511 | ||
| 512 | bool is_tap_key(key_t key) | 512 | bool is_tap_key(keypos_t key) |
| 513 | { | 513 | { |
| 514 | action_t action = layer_switch_get_action(key); | 514 | action_t action = layer_switch_get_action(key); |
| 515 | 515 | ||