diff options
| author | jpetermans <tibcmhhm@gmail.com> | 2017-05-24 11:51:20 -0700 |
|---|---|---|
| committer | jpetermans <tibcmhhm@gmail.com> | 2017-05-24 11:51:20 -0700 |
| commit | 2dcd6c38fa478b40a973c9411c3f5b4c87ae0ba7 (patch) | |
| tree | 289d5cce94ad5883741f0b637749d87680c14d33 /quantum/keymap_extras | |
| parent | d89114400c398b900e27bf324a7973d1e0f25e58 (diff) | |
| parent | 7a4ec3bd926865e490fbf7c5ec68d762e998683f (diff) | |
Merge remote-tracking branch 'upstream/master' into infinity60
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 |