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

master
QMK Bot 2 years ago
commit 33e926b856
  1. 2
      keyboards/keychron/q10/iso_encoder/info.json
  2. 2
      keyboards/keychron/q6/iso_encoder/info.json
  3. 2
      keyboards/keychron/v10/iso_encoder/info.json
  4. 2
      keyboards/keychron/v6/iso_encoder/info.json

@ -88,7 +88,7 @@
{"matrix":[3,12], "x":14.75, "y":3.25}, {"matrix":[3,12], "x":14.75, "y":3.25},
{"matrix":[3,13], "x":15.75, "y":3.25}, {"matrix":[3,13], "x":15.75, "y":3.25},
{"matrix":[3,14], "x":16.75, "y":3.25}, {"matrix":[3,14], "x":16.75, "y":3.25},
{"matrix":[2,14], "x":17.75, "y":3.25, "w":1.25, "h":2}, {"matrix":[2,14], "x":17.75, "y":2.25, "w":1.25, "h":2},
{"matrix":[3,15], "x":19.5, "y":3.25}, {"matrix":[3,15], "x":19.5, "y":3.25},
{"matrix":[4, 0], "x":0, "y":4.25}, {"matrix":[4, 0], "x":0, "y":4.25},

@ -105,7 +105,7 @@
{"matrix":[3,15], "x":21.5, "y":2.25, "h":2}, {"matrix":[3,15], "x":21.5, "y":2.25, "h":2},
{"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
{"matrix":[4, 1], "x":2.25, "y":4.25}, {"matrix":[4, 1], "x":1.25, "y":4.25},
{"matrix":[4, 2], "x":2.25, "y":4.25}, {"matrix":[4, 2], "x":2.25, "y":4.25},
{"matrix":[4, 3], "x":3.25, "y":4.25}, {"matrix":[4, 3], "x":3.25, "y":4.25},
{"matrix":[4, 4], "x":4.25, "y":4.25}, {"matrix":[4, 4], "x":4.25, "y":4.25},

@ -88,7 +88,7 @@
{"matrix":[3,12], "x":14.75, "y":3.25}, {"matrix":[3,12], "x":14.75, "y":3.25},
{"matrix":[3,13], "x":15.75, "y":3.25}, {"matrix":[3,13], "x":15.75, "y":3.25},
{"matrix":[3,14], "x":16.75, "y":3.25}, {"matrix":[3,14], "x":16.75, "y":3.25},
{"matrix":[2,14], "x":17.75, "y":3.25, "w":1.25, "h":2}, {"matrix":[2,14], "x":17.75, "y":2.25, "w":1.25, "h":2},
{"matrix":[3,15], "x":19.5, "y":3.25}, {"matrix":[3,15], "x":19.5, "y":3.25},
{"matrix":[4, 0], "x":0, "y":4.25}, {"matrix":[4, 0], "x":0, "y":4.25},

@ -105,7 +105,7 @@
{"matrix":[3,15], "x":21.5, "y":2.25, "h":2}, {"matrix":[3,15], "x":21.5, "y":2.25, "h":2},
{"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
{"matrix":[4, 1], "x":2.25, "y":4.25}, {"matrix":[4, 1], "x":1.25, "y":4.25},
{"matrix":[4, 2], "x":2.25, "y":4.25}, {"matrix":[4, 2], "x":2.25, "y":4.25},
{"matrix":[4, 3], "x":3.25, "y":4.25}, {"matrix":[4, 3], "x":3.25, "y":4.25},
{"matrix":[4, 4], "x":4.25, "y":4.25}, {"matrix":[4, 4], "x":4.25, "y":4.25},

Loading…
Cancel
Save