diff options
| author | QMK Bot <hello@qmk.fm> | 2021-01-27 00:53:05 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-01-27 00:53:05 +0000 |
| commit | 349571d11149654d19fe15d19cd44e676af16ae8 (patch) | |
| tree | 2d5a8246a8d3bb4c83df3a53ee7746470fc1c40e | |
| parent | 784e4688f8915640009be46a47df57df5d6f3eba (diff) | |
| parent | a0d9221dcc085b196e071581e9e7d8d9a96037fe (diff) | |
| download | qmk_firmware-349571d11149654d19fe15d19cd44e676af16ae8.tar.gz qmk_firmware-349571d11149654d19fe15d19cd44e676af16ae8.zip | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | keyboards/swiftrax/retropad/config.h (renamed from keyboards/handwired/swiftrax/retropad/config.h) | 0 | ||||
| -rw-r--r-- | keyboards/swiftrax/retropad/info.json (renamed from keyboards/handwired/swiftrax/retropad/info.json) | 0 | ||||
| -rw-r--r-- | keyboards/swiftrax/retropad/keymaps/default/keymap.c (renamed from keyboards/handwired/swiftrax/retropad/keymaps/default/keymap.c) | 0 | ||||
| -rw-r--r-- | keyboards/swiftrax/retropad/keymaps/via/keymap.c (renamed from keyboards/handwired/swiftrax/retropad/keymaps/via/keymap.c) | 0 | ||||
| -rw-r--r-- | keyboards/swiftrax/retropad/keymaps/via/rules.mk (renamed from keyboards/handwired/swiftrax/retropad/keymaps/via/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/swiftrax/retropad/readme.md (renamed from keyboards/handwired/swiftrax/retropad/readme.md) | 2 | ||||
| -rw-r--r-- | keyboards/swiftrax/retropad/retropad.c (renamed from keyboards/handwired/swiftrax/retropad/retropad.c) | 0 | ||||
| -rw-r--r-- | keyboards/swiftrax/retropad/retropad.h (renamed from keyboards/handwired/swiftrax/retropad/retropad.h) | 0 | ||||
| -rw-r--r-- | keyboards/swiftrax/retropad/rules.mk (renamed from keyboards/handwired/swiftrax/retropad/rules.mk) | 0 |
9 files changed, 1 insertions, 1 deletions
diff --git a/keyboards/handwired/swiftrax/retropad/config.h b/keyboards/swiftrax/retropad/config.h index e604eda419..e604eda419 100644 --- a/keyboards/handwired/swiftrax/retropad/config.h +++ b/keyboards/swiftrax/retropad/config.h diff --git a/keyboards/handwired/swiftrax/retropad/info.json b/keyboards/swiftrax/retropad/info.json index 9637c7b3f7..9637c7b3f7 100644 --- a/keyboards/handwired/swiftrax/retropad/info.json +++ b/keyboards/swiftrax/retropad/info.json diff --git a/keyboards/handwired/swiftrax/retropad/keymaps/default/keymap.c b/keyboards/swiftrax/retropad/keymaps/default/keymap.c index 8b9992e1d7..8b9992e1d7 100644 --- a/keyboards/handwired/swiftrax/retropad/keymaps/default/keymap.c +++ b/keyboards/swiftrax/retropad/keymaps/default/keymap.c diff --git a/keyboards/handwired/swiftrax/retropad/keymaps/via/keymap.c b/keyboards/swiftrax/retropad/keymaps/via/keymap.c index 8b9992e1d7..8b9992e1d7 100644 --- a/keyboards/handwired/swiftrax/retropad/keymaps/via/keymap.c +++ b/keyboards/swiftrax/retropad/keymaps/via/keymap.c diff --git a/keyboards/handwired/swiftrax/retropad/keymaps/via/rules.mk b/keyboards/swiftrax/retropad/keymaps/via/rules.mk index 036bd6d1c3..036bd6d1c3 100644 --- a/keyboards/handwired/swiftrax/retropad/keymaps/via/rules.mk +++ b/keyboards/swiftrax/retropad/keymaps/via/rules.mk diff --git a/keyboards/handwired/swiftrax/retropad/readme.md b/keyboards/swiftrax/retropad/readme.md index 5dd2e2dff5..34f6af405f 100644 --- a/keyboards/handwired/swiftrax/retropad/readme.md +++ b/keyboards/swiftrax/retropad/readme.md @@ -8,6 +8,6 @@ Make example for this keyboard (after setting up your build environment): - make handwired/swiftrax/retropad:default + make swiftrax/retropad:default See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/handwired/swiftrax/retropad/retropad.c b/keyboards/swiftrax/retropad/retropad.c index 3ffe29528f..3ffe29528f 100644 --- a/keyboards/handwired/swiftrax/retropad/retropad.c +++ b/keyboards/swiftrax/retropad/retropad.c diff --git a/keyboards/handwired/swiftrax/retropad/retropad.h b/keyboards/swiftrax/retropad/retropad.h index e7527d5c00..e7527d5c00 100644 --- a/keyboards/handwired/swiftrax/retropad/retropad.h +++ b/keyboards/swiftrax/retropad/retropad.h diff --git a/keyboards/handwired/swiftrax/retropad/rules.mk b/keyboards/swiftrax/retropad/rules.mk index 8771c701de..8771c701de 100644 --- a/keyboards/handwired/swiftrax/retropad/rules.mk +++ b/keyboards/swiftrax/retropad/rules.mk |