Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into develop | James Young | 2021-08-11 | 1 | -10/+58 |
|\ | | | | | | | | | | | | | | | | | 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 | ||||
| * | [Keyboard] Improvements to m122_3270 (#13947) | jmaynard | 2021-08-11 | 1 | -5/+54 |
| | | | | | | Co-authored-by: Jay Maynard <[email protected]> | ||||
* | | Fix & clean up tronguylabs/m122_3270 (#13684) | Ryan | 2021-07-25 | 1 | -127/+100 |
|/ | |||||
* | [Keyboard] Initial Tron Guy Labs keyboard implementation. (#13438) | jmaynard | 2021-07-21 | 1 | -0/+193 |
Co-authored-by: Drashna Jaelre <[email protected]> Co-authored-by: Ryan <[email protected]> Co-authored-by: Jay Maynard <[email protected]> |