diff options
| author | Wojciech Siewierski <wojciech.siewierski@onet.pl> | 2016-04-03 11:14:08 +0200 |
|---|---|---|
| committer | Wojciech Siewierski <wojciech.siewierski@onet.pl> | 2016-04-03 11:23:00 +0200 |
| commit | 47dd29513eeec7b7f639bef6df441a905ce8bacb (patch) | |
| tree | 29170847273e786384bd3d7c7781e67dc4335bbb /keyboard/alps64 | |
| parent | 8ef14d09b8451b3f2a77e6f019922eae0ac43642 (diff) | |
| parent | 8d39263d2444f0273327902684c802b218efb7b6 (diff) | |
| download | firmware-47dd29513eeec7b7f639bef6df441a905ce8bacb.tar.gz firmware-47dd29513eeec7b7f639bef6df441a905ce8bacb.tar.bz2 firmware-47dd29513eeec7b7f639bef6df441a905ce8bacb.zip | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware into modifier-release-fix
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 |