Merge remote-tracking branch 'origin/master' into develop

2021-01-27 00:53:05 +00:00 · 2021-01-27 00:53:05 +00:00 · 349571d111
parent 784e4688f8 a0d9221dcc
commit 349571d111
9 changed files with 1 additions and 1 deletions
--- a/keyboards/handwired/swiftrax/retropad/config.h
+++ b/keyboards/handwired/swiftrax/retropad/config.h
--- a/keyboards/handwired/swiftrax/retropad/info.json
+++ b/keyboards/handwired/swiftrax/retropad/info.json
--- a/keyboards/handwired/swiftrax/retropad/keymaps/default/keymap.c
+++ b/keyboards/handwired/swiftrax/retropad/keymaps/default/keymap.c
--- a/keyboards/handwired/swiftrax/retropad/keymaps/via/keymap.c
+++ b/keyboards/handwired/swiftrax/retropad/keymaps/via/keymap.c
--- a/keyboards/handwired/swiftrax/retropad/keymaps/via/rules.mk
+++ b/keyboards/handwired/swiftrax/retropad/keymaps/via/rules.mk
--- a/keyboards/handwired/swiftrax/retropad/readme.md
+++ b/keyboards/handwired/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).
--- a/keyboards/handwired/swiftrax/retropad/retropad.c
+++ b/keyboards/handwired/swiftrax/retropad/retropad.c
--- a/keyboards/handwired/swiftrax/retropad/retropad.h
+++ b/keyboards/handwired/swiftrax/retropad/retropad.h
--- a/keyboards/handwired/swiftrax/retropad/rules.mk
+++ b/keyboards/handwired/swiftrax/retropad/rules.mk