diff options
| author | jpetermans <tibcmhhm@gmail.com> | 2017-05-08 15:24:50 -0700 |
|---|---|---|
| committer | jpetermans <tibcmhhm@gmail.com> | 2017-05-08 15:24:50 -0700 |
| commit | 967cf0f6d43bd05c9951c7c31190971acd0799ea (patch) | |
| tree | 34ff786a7e5177c6edc48e93b69ce71132cb3cbf /quantum/keymap_extras | |
| parent | 5df74f3ba73f18f6bbd13b82a3a960c86fa592e1 (diff) | |
| parent | 153eb95ab208cf5563ce2fae7ec68981b64d11ce (diff) | |
Merge remote-tracking branch 'upstream/master' into user_led_configuration
Diffstat (limited to 'quantum/keymap_extras')
| -rw-r--r-- | quantum/keymap_extras/keymap_german_ch.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/quantum/keymap_extras/keymap_german_ch.h b/quantum/keymap_extras/keymap_german_ch.h index 8332e00af3..67350d6602 100644 --- a/quantum/keymap_extras/keymap_german_ch.h +++ b/quantum/keymap_extras/keymap_german_ch.h @@ -33,6 +33,10 @@ #define CH_E KC_E #define CH_F KC_F #define CH_G KC_G +#ifdef CH_H +// The ChibiOS ch.h file defines this... +#undef CH_H +#endif #define CH_H KC_H #define CH_I KC_I #define CH_J KC_J |