diff options
| author | Stephan Bösebeck <sb@caluga.de> | 2016-04-01 23:54:16 +0200 |
|---|---|---|
| committer | Stephan Bösebeck <sb@caluga.de> | 2016-04-01 23:54:16 +0200 |
| commit | aee8715815544b076c123d4ed55c76e23a7e54d0 (patch) | |
| tree | ea5beb11e41bf0cc0257f1a098b2218b48a83b84 /keyboard/jd45 | |
| parent | c274699085b2f922a5e8b14b21aa377249e62d29 (diff) | |
| parent | de904af36072f53d2354bff0ed36b63014ad0d61 (diff) | |
| download | qmk_firmware-aee8715815544b076c123d4ed55c76e23a7e54d0.tar.gz qmk_firmware-aee8715815544b076c123d4ed55c76e23a7e54d0.tar.xz | |
Merge branch 'master' of https://github.com/jackhumbert/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 076dced82..f6a8d10c5 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 05dd46e79..05dd46e79 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 f261b5463..f261b5463 100644 --- a/keyboard/jd45/keymaps/keymap_justin.c +++ b/keyboard/jd45/keymaps/justin.c |