diff options
| author |  Jack Humbert <jack.humb@gmail.com> | 2016-03-30 00:45:48 -0400 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2016-03-30 00:45:48 -0400 |
| commit | e7377dc24b4aaf97f9c48ef7db78b7b6cbabe748 (patch) | |
| tree | 7774668076bb8c8d2331028bb540510c078e60be /keyboard/alps64 | |
| parent | b8ac5095708b5023f5e3e375b22534f8b395741f (diff) | |
| parent | 4a676746a6d8c9b47956f863ead335e995677c53 (diff) | |
| download | qmk_firmware-e7377dc24b4aaf97f9c48ef7db78b7b6cbabe748.tar.gz | |
Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard
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 e90dcedb6..7634c4280 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 a54899196..a54899196 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 d297d72fe..d297d72fe 100644 --- a/keyboard/alps64/keymap_hasu.c +++ b/keyboard/alps64/keymaps/hasu.c |