diff options
| author | Stephan Bösebeck <stephan.boesebeck@holidayinsider.com> | 2016-04-02 15:15:21 +0200 |
|---|---|---|
| committer | Stephan Bösebeck <stephan.boesebeck@holidayinsider.com> | 2016-04-02 15:15:21 +0200 |
| commit | f0424a0c0fa4153234ad6979929e5a2426c86f21 (patch) | |
| tree | 53deb01f09e9feb9a2fa11259c75411adceb2f3c /keyboard/jd45 | |
| parent | 71cdfe11682cf63c262380747d8a1b3d48a6bad0 (diff) | |
| parent | aee8715815544b076c123d4ed55c76e23a7e54d0 (diff) | |
Merge branch 'master' of https://github.com/sboesebeck/qmk_firmware
Diffstat (limited to 'keyboard/jd45')
| -rw-r--r-- | keyboard/jd45/Makefile | 4 | ||||
| -rw-r--r-- | keyboard/jd45/keymaps/default.c (renamed from keyboard/jd45/keymaps/keymap_default.c) | 0 | ||||
| -rw-r--r-- | keyboard/jd45/keymaps/justin.c (renamed from keyboard/jd45/keymaps/keymap_justin.c) | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/keyboard/jd45/Makefile b/keyboard/jd45/Makefile index 076dced829..f6a8d10c58 100644 --- a/keyboard/jd45/Makefile +++ b/keyboard/jd45/Makefile @@ -54,9 +54,9 @@ SRC = jd45.c \ backlight.c ifdef KEYMAP - SRC := keymaps/keymap_$(KEYMAP).c $(SRC) + SRC := keymaps/keymaps/(KEYMAP).c $(SRC) else - SRC := keymaps/keymap_default.c $(SRC) + SRC := keymaps/keymaps/default.c $(SRC) endif CONFIG_H = config.h diff --git a/keyboard/jd45/keymaps/keymap_default.c b/keyboard/jd45/keymaps/default.c index 05dd46e792..05dd46e792 100644 --- a/keyboard/jd45/keymaps/keymap_default.c +++ b/keyboard/jd45/keymaps/default.c diff --git a/keyboard/jd45/keymaps/keymap_justin.c b/keyboard/jd45/keymaps/justin.c index f261b54633..f261b54633 100644 --- a/keyboard/jd45/keymaps/keymap_justin.c +++ b/keyboard/jd45/keymaps/justin.c |