diff options
| author | Priyadi Iman Nurcahyo <priyadi@priyadi.net> | 2017-02-23 18:11:59 +0700 |
|---|---|---|
| committer | Priyadi Iman Nurcahyo <priyadi@priyadi.net> | 2017-02-23 18:11:59 +0700 |
| commit | b27a8dea1bfd50e4e2428235b5dba0d9a4bb8cba (patch) | |
| tree | db6ee0b1987da0d56846560082a9fb7a5195e9d9 /quantum | |
| parent | 3dab8a60fca182376d1df07d3f1e25882aa57be4 (diff) | |
| parent | 84b2f86f24b8e12973dccbdb9120cac5353947df (diff) | |
| download | qmk_firmware-b27a8dea1bfd50e4e2428235b5dba0d9a4bb8cba.tar.gz qmk_firmware-b27a8dea1bfd50e4e2428235b5dba0d9a4bb8cba.zip | |
Merge branch 'master' into promethium
Diffstat (limited to 'quantum')
| -rw-r--r-- | quantum/keymap_extras/keymap_french.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/quantum/keymap_extras/keymap_french.h b/quantum/keymap_extras/keymap_french.h index 834c69650e..401bbdf644 100644 --- a/quantum/keymap_extras/keymap_french.h +++ b/quantum/keymap_extras/keymap_french.h @@ -4,7 +4,9 @@ #include "keymap.h" // Alt gr +#ifndef ALGR #define ALGR(kc) RALT(kc) +#endif #define NO_ALGR KC_RALT // Normal characters @@ -72,7 +74,7 @@ #define FR_PIPE ALGR(KC_6) #define FR_GRV ALGR(KC_7) #define FR_BSLS ALGR(KC_8) -#define FR_CIRC ALGR(KC_9) +#define FR_CCIRC ALGR(KC_9) #define FR_AT ALGR(KC_0) #define FR_RBRC ALGR(FR_RPRN) #define FR_RCBR ALGR(FR_EQL) |