diff options
| author | Stanley Lai <stanleylai.sg@gmail.com> | 2017-02-13 21:36:22 +0100 |
|---|---|---|
| committer | Stanley Lai <stanleylai.sg@gmail.com> | 2017-02-13 21:36:22 +0100 |
| commit | a8eba1bddaf55224939a86bfa4d8e1b53e1d82db (patch) | |
| tree | 906568677ed027a807d5e9c0c1bc1c2ae001f0f6 /quantum/quantum.h | |
| parent | 53ea854462c0b3b2c3c58a36b714ac02f773c74f (diff) | |
| parent | fd2925efbac0d7963f3d267dd5264f08a0a4e9dc (diff) | |
| download | qmk_firmware-a8eba1bddaf55224939a86bfa4d8e1b53e1d82db.tar.gz qmk_firmware-a8eba1bddaf55224939a86bfa4d8e1b53e1d82db.tar.xz | |
Merge remote-tracking branch 'refs/remotes/qmk/master'
Diffstat (limited to 'quantum/quantum.h')
| -rw-r--r-- | quantum/quantum.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/quantum/quantum.h b/quantum/quantum.h index e6adf974a..18f072189 100644 --- a/quantum/quantum.h +++ b/quantum/quantum.h @@ -15,7 +15,6 @@ #ifdef RGBLIGHT_ENABLE #include "rgblight.h" #endif - #include "action_layer.h" #include "eeconfig.h" #include <stddef.h> @@ -63,6 +62,10 @@ extern uint32_t default_layer_state; #include "process_printer.h" #endif +#ifdef COMBO_ENABLE + #include "process_combo.h" +#endif + #define SEND_STRING(str) send_string(PSTR(str)) void send_string(const char *str); |