summaryrefslogtreecommitdiffstats
path: root/keyboards/merge
Commit message (Expand)AuthorAgeFilesLines
* [Core] Change OLED task function to be boolean (#14864)Drashna Jaelre2021-11-022-2/+4
* Remove BLUETOOTH_ENABLE from keyboard-level rules.mk (#14379)Ryan2021-09-123-3/+0
* Remove width, height and key_count from info.json (#14274)Ryan2021-09-123-6/+0
* [Core] Refactor OLED to allow easy addition of other types (#13454)Xelus222021-08-243-3/+4
* Remove Full Bootmagic (#13846)James Young2021-08-063-3/+3
* [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-296-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
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-22 00:15:46 +0000