diff options
| author | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-06-22 11:26:26 -0400 |
|---|---|---|
| committer | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-06-22 11:26:26 -0400 |
| commit | b0caf32741cf415a45333828f1661d9f6b72570f (patch) | |
| tree | 5e2b8203ab232c0a89264e96716ebf1a859f6189 /quantum/keymap_extras | |
| parent | ee3c7892ad585e2e702d8975420d25ae052d97bb (diff) | |
| parent | 8c1bfdf0bd9aae13d8722fd107deca40ffc7932c (diff) | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'quantum/keymap_extras')
| -rw-r--r-- | quantum/keymap_extras/keymap_neo2.h | 2 | ||||
| -rw-r--r-- | quantum/keymap_extras/keymap_norwegian.h (renamed from quantum/keymap_extras/keymap_norwegian.c) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/quantum/keymap_extras/keymap_neo2.h b/quantum/keymap_extras/keymap_neo2.h index b54cb74b90..80439af347 100644 --- a/quantum/keymap_extras/keymap_neo2.h +++ b/quantum/keymap_extras/keymap_neo2.h @@ -2,7 +2,7 @@ #define KEYMAP_NEO2 #include "keymap.h" -#include "keymap_extras/keymap_german.h" +#include "keymap_german.h" #define NEO_A KC_D #define NEO_B KC_N diff --git a/quantum/keymap_extras/keymap_norwegian.c b/quantum/keymap_extras/keymap_norwegian.h index 018bfeae59..018bfeae59 100644 --- a/quantum/keymap_extras/keymap_norwegian.c +++ b/quantum/keymap_extras/keymap_norwegian.h |