diff options
| author | That-Canadian <poole.chris.11@gmail.com> | 2017-08-09 23:17:48 -0400 |
|---|---|---|
| committer | That-Canadian <poole.chris.11@gmail.com> | 2017-08-09 23:17:48 -0400 |
| commit | 48a89ad8649ffe5fa054eccf1b0498f8a0a49b32 (patch) | |
| tree | 507acee914061af992dd8d657b2374da544c47ae /quantum/quantum.h | |
| parent | 597ff7aee9a04b4f4f41d6d1f5b2e1223e0e83b8 (diff) | |
| parent | a5ab2412ab6bb4df9be121faa8caaf900dc0ba0d (diff) | |
| download | firmware-48a89ad8649ffe5fa054eccf1b0498f8a0a49b32.tar.gz firmware-48a89ad8649ffe5fa054eccf1b0498f8a0a49b32.tar.bz2 firmware-48a89ad8649ffe5fa054eccf1b0498f8a0a49b32.zip | |
Merge remote-tracking branch 'upstream/master'
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]; |