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.h | |
| parent | 175db1a549a46518c2f2511ac1624d594eb07216 (diff) | |
| parent | 5ad103fa51083cb26d3516e5598b7b2a099b1521 (diff) | |
| download | firmware-430151dd51b8b0d925850ad4d52c8bae41d3c154.tar.gz firmware-430151dd51b8b0d925850ad4d52c8bae41d3c154.tar.bz2 firmware-430151dd51b8b0d925850ad4d52c8bae41d3c154.zip | |
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# docs/faq_keymap.md
Diffstat (limited to 'quantum/quantum.h')
| -rw-r--r-- | quantum/quantum.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/quantum/quantum.h b/quantum/quantum.h index 453cb43f8..9a6d691a1 100644 --- a/quantum/quantum.h +++ b/quantum/quantum.h @@ -99,6 +99,10 @@ extern uint32_t default_layer_state; #include "process_combo.h" #endif +#ifdef KEY_LOCK_ENABLE + #include "process_key_lock.h" +#endif + #define SEND_STRING(str) send_string(PSTR(str)) extern const bool ascii_to_shift_lut[0x80]; extern const uint8_t ascii_to_keycode_lut[0x80]; |