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/alps64 | |
| parent | c274699085b2f922a5e8b14b21aa377249e62d29 (diff) | |
| parent | de904af36072f53d2354bff0ed36b63014ad0d61 (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 |