diff options
| author | James Young <18669334+noroadsleft@users.noreply.github.com> | 2021-08-19 11:32:23 -0700 |
|---|---|---|
| committer | James Young <18669334+noroadsleft@users.noreply.github.com> | 2021-08-19 11:32:23 -0700 |
| commit | 4279b14adffe081a3dfb17fa0f04ed21513e5eda (patch) | |
| tree | 770bd82b05595b686ad8cfdce79ea7f8439bda83 /keyboards | |
| parent | 9d1c98c891bb8e1e98dc618e0693a7efff23a22e (diff) | |
| parent | f4f679779e1404d9dc34c64823b9eb993bfa7ab3 (diff) | |
Merge remote-tracking branch 'upstream/master' into develop
Conflicts:
keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk
keyboards/space_space/rules.mk
Diffstat (limited to 'keyboards')
129 files changed, 5999 insertions, 445 deletions
diff --git a/keyboards/3w6/info.json b/keyboards/3w6/info.json new file mode 100644 index 0000000000..5a0e9be2f4 --- /dev/null +++ b/keyboards/3w6/info.json @@ -0,0 +1,56 @@ +{ + "keyboard_name": "3w6", + "url": "https://github.com/weteor/3W6/", + "maintainer": "weteor", + "width": 13, + "height": 5, + "layouts": { + "LAYOUT": { + "layout": [ + {"label": "k00", "x": 0, "y": 0.8}, + {"label": "k01", "x": 1, "y": 0.2}, |