diff options
| author | Balz Guenat <balz.guenat@gmail.com> | 2017-08-12 12:14:33 +0200 |
|---|---|---|
| committer | Balz Guenat <balz.guenat@gmail.com> | 2017-08-12 12:14:33 +0200 |
| commit | 430151dd51b8b0d925850ad4d52c8bae41d3c154 (patch) | |
| tree | f3d13283dd812277bc30d75dff32ea16508b58c8 /quantum/quantum_keycodes.h | |
| parent | 175db1a549a46518c2f2511ac1624d594eb07216 (diff) | |
| parent | 5ad103fa51083cb26d3516e5598b7b2a099b1521 (diff) | |
| download | qmk_firmware-430151dd51b8b0d925850ad4d52c8bae41d3c154.tar.gz qmk_firmware-430151dd51b8b0d925850ad4d52c8bae41d3c154.zip | |
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# docs/faq_keymap.md
Diffstat (limited to 'quantum/quantum_keycodes.h')
| -rw-r--r-- | quantum/quantum_keycodes.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h index acdb9248d..1bb6706ba 100644 --- a/quantum/quantum_keycodes.h +++ b/quantum/quantum_keycodes.h | |||
| @@ -419,6 +419,10 @@ enum quantum_keycodes { | |||
| 419 | OUT_BT, | 419 | OUT_BT, |
| 420 | #endif | 420 | #endif |
| 421 | 421 | ||
| 422 | #ifdef KEY_LOCK_ENABLE | ||
| 423 | KC_LOCK, | ||
| 424 | #endif | ||
| 425 | |||
| 422 | // always leave at the end | 426 | // always leave at the end |
| 423 | SAFE_RANGE | 427 | SAFE_RANGE |
| 424 | }; | 428 | }; |