diff options
| author | That-Canadian <poole.chris.11@gmail.com> | 2017-07-15 03:34:37 +0200 |
|---|---|---|
| committer | That-Canadian <poole.chris.11@gmail.com> | 2017-07-15 03:34:37 +0200 |
| commit | 5412229603c1b16051776e81bed57697adf339e2 (patch) | |
| tree | 088e5e6d1d0d448f0e5c4032a830c27b33a126ab /quantum | |
| parent | d73d30aa846f4378b8f1fa072a4620520b3c1953 (diff) | |
| parent | 6ed8ce4f598f838b971aa290a499f852827e1b58 (diff) | |
| download | qmk_firmware-5412229603c1b16051776e81bed57697adf339e2.tar.gz qmk_firmware-5412229603c1b16051776e81bed57697adf339e2.tar.xz | |
Merge remote-tracking branch 'upstream/master'
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 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) |