James Young
|
345f6dc4e6
|
Merge remote-tracking branch 'upstream/master' into develop
Fixes merge conflicts in:
- keyboards/poker87c/rules.mk and keyboards/poker87d/rules.mk
- Conflicts from PR 13961
- keyboards/tronguylabs/m122_3270/keymaps/default/keymap.c
- Conflict from PR 13947
|
2021-08-11 09:48:25 -07:00 |
jmaynard
|
710d37b3eb
|
[Keyboard] Improvements to m122_3270 (#13947)
Co-authored-by: Jay Maynard <jmaynard@conmicro.com>
|
2021-08-11 00:21:40 -07:00 |
Ryan
|
8cc568bc29
|
Fix & clean up tronguylabs/m122_3270 (#13684)
|
2021-07-25 11:02:36 +10:00 |
|
jmaynard
|
8e905a7a5c
|
[Keyboard] Initial Tron Guy Labs keyboard implementation. (#13438)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Jay Maynard <jmaynard@conmicro.com>
|
2021-07-21 23:39:45 -07:00 |