diff options
| author | milestogo <milestogo@users.noreply.github.com> | 2017-02-09 23:28:15 -0800 |
|---|---|---|
| committer | milestogo <milestogo@users.noreply.github.com> | 2017-02-09 23:28:15 -0800 |
| commit | 41c93575a838e9b201ca113165085f47198e109d (patch) | |
| tree | 897558fe82aa473d9461ba350c939c75a3ac6b5f /quantum/quantum.h | |
| parent | b0dfb037dc0b8b20fd87b3c88449a2ce20ff80e1 (diff) | |
| parent | 6c462e0c0155a892a6efd0881086f8a7032316d2 (diff) | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
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); |