aboutsummaryrefslogtreecommitdiff
path: root/keyboards/merge
Commit message (Expand)AuthorAgeFilesLines
* Convert Encoder callbacks to be boolean functions (#12805)Drashna Jaelre2021-05-216-113/+119
* [Keyboard] Add UM-70 (#12556)duoshock2021-05-1412-0/+691
* [Keyboard] Update ISO Macro vendor ID to meet VIA requirement (#12564)duoshock2021-04-201-1/+1
* Add UC-1 keypad (#11926)duoshock2021-03-2410-0/+245
* Add missing info.json files for keyboards (#12239)James Young2021-03-151-0/+23
* [Keyboard] Add ISO Macro keyboard (#11517)duoshock2021-01-139-0/+245