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/alps64 | |
| parent | 95a88c09e18a7531a64838ceaa52df37bad8dc0d (diff) | |
| parent | ae47275bf34549a0f66cb2f37daca299fd4ecdee (diff) | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'keyboard/alps64')
| -rw-r--r-- | keyboard/alps64/Makefile | 4 | ||||
| -rw-r--r-- | keyboard/alps64/keymaps/default.c (renamed from keyboard/alps64/keymap_plain.c) | 0 | ||||
| -rw-r--r-- | keyboard/alps64/keymaps/hasu.c (renamed from keyboard/alps64/keymap_hasu.c) | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/keyboard/alps64/Makefile b/keyboard/alps64/Makefile index e90dcedb67..7634c4280e 100644 --- a/keyboard/alps64/Makefile +++ b/keyboard/alps64/Makefile @@ -53,9 +53,9 @@ SRC = keymap_common.c \ led.c ifdef KEYMAP - SRC := keymap_$(KEYMAP).c $(SRC) + SRC := keymaps/$(KEYMAP).c $(SRC) else - SRC := keymap_plain.c $(SRC) + SRC := keymaps/default.c $(SRC) endif CONFIG_H = config.h diff --git a/keyboard/alps64/keymap_plain.c b/keyboard/alps64/keymaps/default.c index a54899196a..a54899196a 100644 --- a/keyboard/alps64/keymap_plain.c +++ b/keyboard/alps64/keymaps/default.c diff --git a/keyboard/alps64/keymap_hasu.c b/keyboard/alps64/keymaps/hasu.c index d297d72fea..d297d72fea 100644 --- a/keyboard/alps64/keymap_hasu.c +++ b/keyboard/alps64/keymaps/hasu.c |