summaryrefslogtreecommitdiffstats
path: root/keyboards/merge/um70
Commit message (Expand)AuthorAgeFilesLines
* Remove BLUETOOTH_ENABLE from keyboard-level rules.mk (#14379)Ryan2021-09-121-1/+0
* Remove width, height and key_count from info.json (#14274)Ryan2021-09-121-2/+0
* [Core] Refactor OLED to allow easy addition of other types (#13454)Xelus222021-08-243-3/+4
* Remove Full Bootmagic (#13846)James Young2021-08-061-1/+1
* [Keyboard] Fix compile size for the Merge UM70 via keymap (#13690)Drashna Jaelre2021-07-251-1/+4
* merge/um70:via: Avoid sprintf() to make the code fit into flash (#12919)Sergey Vlasov2021-05-301-5/+9
* 2021 May 29 Breaking Changes Update (#13034)James Young2021-05-292-45/+47
* [Keyboard] Add UM-70 (#12556)duoshock2021-05-1412-0/+691