diff options
| author | Priyadi Iman Nurcahyo <priyadi@priyadi.net> | 2017-02-09 01:01:24 +0700 |
|---|---|---|
| committer | Priyadi Iman Nurcahyo <priyadi@priyadi.net> | 2017-02-09 01:01:24 +0700 |
| commit | 3f2c0bfa86150c9fc91d8f467ed3728beecbb480 (patch) | |
| tree | d262d74a36b2be52199f976121365c83e536d4fa /quantum/quantum.h | |
| parent | 3835b4bfcc0ef296a94c9fe78f27d5cada1ab73b (diff) | |
| parent | 0a9fda968da521e373564895d6ea6774cd1480d9 (diff) | |
Merge branch 'master' into promethium
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); |