diff options
| author | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-03-30 13:14:01 -0400 |
|---|---|---|
| committer | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-03-30 13:14:01 -0400 |
| commit | 5bbcc484a8e14ffb13354df4efdd460ebe7200e1 (patch) | |
| tree | 65b0a4c4e659b60038ec63706c46fb21de153598 /keyboard/jd45 | |
| parent | 95a88c09e18a7531a64838ceaa52df37bad8dc0d (diff) | |
| parent | ae47275bf34549a0f66cb2f37daca299fd4ecdee (diff) | |
| download | qmk_firmware-5bbcc484a8e14ffb13354df4efdd460ebe7200e1.tar.gz qmk_firmware-5bbcc484a8e14ffb13354df4efdd460ebe7200e1.zip | |
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 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 |