diff options
| author | Xyverz <xyverz@gmail.com> | 2017-02-11 08:34:27 +0100 |
|---|---|---|
| committer | Xyverz <xyverz@gmail.com> | 2017-02-11 08:34:27 +0100 |
| commit | 902d5077cd54f3a964e3276d7858212d975818ec (patch) | |
| tree | cddf5a379614f421908bbe57ae5d396cc1e2ed37 /quantum/quantum.h | |
| parent | 4d7105c2cf47c7604b54cdf488b4eb9d08c1f1cf (diff) | |
| parent | 835556da9111d91b71c545d6a273e843f07631ae (diff) | |
| download | qmk_firmware-902d5077cd54f3a964e3276d7858212d975818ec.tar.gz qmk_firmware-902d5077cd54f3a964e3276d7858212d975818ec.tar.xz | |
Merge remote-tracking branch 'upstream/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); |