diff options
| author | Adam YH Lee <adam.yh.lee@gmail.com> | 2017-04-16 15:20:31 -0700 |
|---|---|---|
| committer | Adam YH Lee <adam.yh.lee@gmail.com> | 2017-04-16 15:20:31 -0700 |
| commit | 9d4050586d24cdfbe5257c094fbb6c1be51f176f (patch) | |
| tree | 8cf123260835331d75d02c5b15d0fb39ceba3256 /quantum/keymap_extras | |
| parent | 7e930626eb5f69d6a4de0594c6f5930334d801f8 (diff) | |
| parent | b5e8327755100252060afbd54e16322522b4f1e9 (diff) | |
| download | firmware-9d4050586d24cdfbe5257c094fbb6c1be51f176f.tar.gz firmware-9d4050586d24cdfbe5257c094fbb6c1be51f176f.tar.bz2 firmware-9d4050586d24cdfbe5257c094fbb6c1be51f176f.zip | |
Merge branch 'master' into layouts/adam-lee
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 8332e00af..67350d660 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 |