diff options
| author | Toni <jeder@mail1a.de> | 2016-07-27 20:35:13 +0200 |
|---|---|---|
| committer | Toni <jeder@mail1a.de> | 2016-07-27 20:35:13 +0200 |
| commit | 9f21c0aa0618531cebc94a2af14d151b9357859f (patch) | |
| tree | c9c3d632669206fe924c495d95608733082d6b3b /quantum | |
| parent | 5e2e8c89e86fbabb65737789ff0545e3e8ac1610 (diff) | |
| parent | 93f366fa7d59d0a3abb03879da88082a1e2128a8 (diff) | |
Merge remote-tracking branch 'origin/master' into iso_split_rshift
merge with master
Diffstat (limited to 'quantum')
| -rw-r--r-- | quantum/keymap_extras/keymap_nordic.h | 2 | ||||
| -rw-r--r-- | quantum/keymap_extras/keymap_norwegian.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/quantum/keymap_extras/keymap_nordic.h b/quantum/keymap_extras/keymap_nordic.h index f8cf4e2e43..da5c829757 100644 --- a/quantum/keymap_extras/keymap_nordic.h +++ b/quantum/keymap_extras/keymap_nordic.h @@ -25,7 +25,7 @@ #define NO_SECT LSFT(NO_HALF) #define NO_QUO2 LSFT(KC_2) #define NO_BULT LSFT(KC_4) -#define NO_AMP LSFT(KC_6) +#define NO_AMPR LSFT(KC_6) #define NO_SLSH LSFT(KC_7) #define NO_LPRN LSFT(KC_8) #define NO_RPRN LSFT(KC_9) diff --git a/quantum/keymap_extras/keymap_norwegian.h b/quantum/keymap_extras/keymap_norwegian.h index 018bfeae59..5c4e8c4955 100644 --- a/quantum/keymap_extras/keymap_norwegian.h +++ b/quantum/keymap_extras/keymap_norwegian.h @@ -13,7 +13,7 @@ #undef NO_BSLS #define NO_BSLS KC_EQL // '\' #undef NO_CIRC -#define NO_CIRC LSFT(C_RBRC) // ^ +#define NO_CIRC LSFT(KC_RBRC) // ^ #undef NO_GRV #define NO_GRV LSFT(NO_BSLS) // #undef NO_OSLH |