diff options
| author | milestogo <milestogo@users.noreply.github.com> | 2017-02-09 23:28:39 -0800 |
|---|---|---|
| committer | milestogo <milestogo@users.noreply.github.com> | 2017-02-09 23:28:39 -0800 |
| commit | b0537f75df73ca5a55355c7546d45577cb2c6a38 (patch) | |
| tree | 0da100dc4fcbe21629a10879b53e13d02c25c170 /quantum/quantum.h | |
| parent | 5ac0e6e6aee64c9b8fade79aaf22bc839e2c6b47 (diff) | |
| parent | 41c93575a838e9b201ca113165085f47198e109d (diff) | |
Merge branch 'master' into sculpt2
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 e6adf974ab..18f072189d 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); |