diff options
| author | Alex Johnstone <alexjj@gmail.com> | 2016-04-05 07:44:37 -0700 |
|---|---|---|
| committer | Alex Johnstone <alexjj@gmail.com> | 2016-04-05 07:44:37 -0700 |
| commit | 1facc53a26294df7fb2a42f8f3d025176b8c384a (patch) | |
| tree | 98eebfa4beb49524c1345c2dd9e93d1fb8aa445a /keyboard/jd45 | |
| parent | 48899673af8b82638d601455f405f03db165bd57 (diff) | |
| parent | 931b0a79fc071498c229b0051be0ebadd934a549 (diff) | |
Merge pull request #5 from jackhumbert/master
Sync with upstream
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 |