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

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

View File

@@ -2,11 +2,8 @@
"keyboard_name": "XMMX",
"url": "",
"maintainer": "qmk",
"width": 18.25,
"height": 6.5,
"layouts": {
"LAYOUT_all": {
"key_count": 96,
"layout": [
{"label":"Esc", "x":0, "y":0},
{"label":"F1", "x":2, "y":0},
@@ -107,7 +104,6 @@
]
},
"LAYOUT_tkl_ansi": {
"key_count": 87,
"layout": [
{"label":"Esc", "x":0, "y":0},
{"label":"F1", "x":2, "y":0},
@@ -199,7 +195,6 @@
]
},
"LAYOUT_tkl_ansi_wkl": {
"key_count": 84,
"layout": [
{"label":"Esc", "x":0, "y":0},
{"label":"F1", "x":2, "y":0},
@@ -288,7 +283,6 @@
]
},
"LAYOUT_tkl_iso": {
"key_count": 88,
"layout": [
{"label":"Esc", "x":0, "y":0},
{"label":"F1", "x":2, "y":0},
@@ -381,7 +375,6 @@
]
},
"LAYOUT_tkl_iso_wkl": {
"key_count": 85,
"layout": [
{"label":"Esc", "x":0, "y":0},
{"label":"F1", "x":2, "y":0},
@@ -472,4 +465,3 @@
}
}
}