diff options
| author | That-Canadian <poole.chris.11@gmail.com> | 2017-07-14 21:35:50 -0400 |
|---|---|---|
| committer | That-Canadian <poole.chris.11@gmail.com> | 2017-07-14 21:35:50 -0400 |
| commit | 6c9b69a4b67e064dacea364f842bf15631d7a5e6 (patch) | |
| tree | f5afa578f218d83245363b68bfb502f517698af6 /quantum | |
| parent | e2e0f5d6d13f6e4d2528ee9ff5e48f896d637092 (diff) | |
| parent | 5412229603c1b16051776e81bed57697adf339e2 (diff) | |
| download | qmk_firmware-6c9b69a4b67e064dacea364f842bf15631d7a5e6.tar.gz qmk_firmware-6c9b69a4b67e064dacea364f842bf15631d7a5e6.zip | |
Merge branch 'master' into minidox
Diffstat (limited to 'quantum')
| -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 b1460c53cc..1c522e8b8b 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) |