summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-07-02 06:09:01 +0000
committerQMK Bot <hello@qmk.fm>2021-07-02 06:09:01 +0000
commit371d3bfbdd0bd863aa161b631b472c2a44f19633 (patch)
treee2857670162f5546ecd108c82f425b6f0363acd9 /keyboards
parentb721e054a2fcb5de5e45a30c07dfe32f11dfb017 (diff)
parent50468835311da76aa80fdeae0a7d01c944af3ff7 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
-rw-r--r--[-rwxr-xr-x]keyboards/planck/keymaps/ishtob/rules.mk (renamed from keyboards/planck/keymaps/ishtob/rule.mk)0
-rw-r--r--keyboards/preonic/keymaps/that_canadian/rules.mk (renamed from keyboards/preonic/keymaps/that_canadian/Makefile)0
-rw-r--r--keyboards/wilba_tech/zeal60/keymaps/tusing/rules.mk (renamed from keyboards/wilba_tech/zeal60/keymaps/tusing/Makefile)0
3 files changed, 0 insertions, 0 deletions
diff --git a/keyboards/planck/keymaps/ishtob/rule.mk b/keyboards/planck/keymaps/ishtob/rules.mk
index c8ba0c919e..c8ba0c919e 100755..100644
--- a/keyboards/planck/keymaps/ishtob/rule.mk
+++ b/keyboards/planck/keymaps/ishtob/rules.mk
diff --git a/keyboards/preonic/keymaps/that_canadian/Makefile b/keyboards/preonic/keymaps/that_canadian/rules.mk
index 773e5c45da..773e5c45da 100644
--- a/keyboards/preonic/keymaps/that_canadian/Makefile
+++ b/keyboards/preonic/keymaps/that_canadian/rules.mk
diff --git a/keyboards/wilba_tech/zeal60/keymaps/tusing/Makefile b/keyboards/wilba_tech/zeal60/keymaps/tusing/rules.mk
index 762905da03..762905da03 100644
--- a/keyboards/wilba_tech/zeal60/keymaps/tusing/Makefile
+++ b/keyboards/wilba_tech/zeal60/keymaps/tusing/rules.mk