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

This commit is contained in:
fauxpark 2021-09-12 14:10:26 +10:00
commit 1895151a9c
1718 changed files with 191 additions and 4137 deletions

View file

@ -2,11 +2,8 @@
"keyboard_name": "Subatomic",
"url": "",
"maintainer": "qmk",
"width": 14,
"height": 5,
"layouts": {
"LAYOUT_ortho_5x14": {
"key_count": 70,
"layout": [
{"label":"k00", "x":0, "y":0},
{"label":"k01", "x":1, "y":0},
@ -82,7 +79,6 @@
},
"LAYOUT_ortho_5x14_1x2uC": {
"key_count": 69,
"layout": [
{"label":"k00", "x":0, "y":0},
{"label":"k01", "x":1, "y":0},
@ -157,7 +153,6 @@
},
"LAYOUT_ortho_5x14_2x2u": {
"key_count": 68,
"layout": [
{"label":"k00", "x":0, "y":0},
{"label":"k01", "x":1, "y":0},