summaryrefslogtreecommitdiff
path: root/keyboards/tronguylabs/m122_3270/keymaps/default
AgeCommit message (Collapse)Author
2021-08-11Merge remote-tracking branch 'upstream/master' into developJames Young
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[Keyboard] Improvements to m122_3270 (#13947)jmaynard
Co-authored-by: Jay Maynard <jmaynard@conmicro.com>
2021-07-25Fix & clean up tronguylabs/m122_3270 (#13684)Ryan
2021-07-21[Keyboard] Initial Tron Guy Labs keyboard implementation. (#13438)jmaynard
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Jay Maynard <jmaynard@conmicro.com>