diff options
author | That-Canadian <poole.chris.11@gmail.com> | 2017-08-03 16:52:30 +0200 |
---|---|---|
committer | That-Canadian <poole.chris.11@gmail.com> | 2017-08-03 16:52:30 +0200 |
commit | c33434c0d64dd7cbd5f6371c7cb4ac5e05924944 (patch) | |
tree | 59fe34d95089a59fa4e615fd995c81d274147bba /quantum/keymap_common.c | |
parent | db5bb7dbbfa2d2eb4f41aa4c768c3c5c8d73f563 (diff) | |
parent | 07ba06d0b6e516bcfa4cbccbed9cfd8dc131072a (diff) | |
download | qmk_firmware-c33434c0d64dd7cbd5f6371c7cb4ac5e05924944.tar.gz qmk_firmware-c33434c0d64dd7cbd5f6371c7cb4ac5e05924944.tar.xz |
Merge branch 'master' into eco-keyboard
Diffstat (limited to 'quantum/keymap_common.c')
-rw-r--r-- | quantum/keymap_common.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c index b1460c53c..1c522e8b8 100644 --- a/quantum/keymap_common.c +++ b/quantum/keymap_common.c @@ -169,7 +169,6 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) } // translates key to keycode -__attribute__ ((weak)) uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key) { // Read entire word (16bits) |