summaryrefslogtreecommitdiff
path: root/keyboards/merge
AgeCommit message (Expand)Author
2022-08-20Merge remote-tracking branch 'origin/master' into developDrashna Jael're
2022-08-20RESET -> QK_BOOT keyboard readme (#18110)Joel Challis
2022-08-06Remove `UNUSED_PINS` (#17931)Nick Brassel
2022-08-03Move keyboard USB IDs and strings to data driven: M (#17859)Ryan
2022-07-09merge/um80 - Fix WPM issues in configurator builds (#17608)Joel Challis
2022-07-03Add keyboard 'UM-80' (#17035)duoshock
2022-03-06merge/uma - Resolve configurator issues (#16551)Joel Challis
2022-01-13[Keyboard] Add UM-A Keyboard (#15584)duoshock
2021-12-09Tidy up NKRO_ENABLE rules (#15382)Ryan
2021-12-01Tidy up `SLEEP_LED_ENABLE` rules (#15362)Ryan
2021-11-05Remove `BOOTMAGIC_ENABLE = lite` option (#15002)James Young
2021-11-02[Core] Change OLED task function to be boolean (#14864)Drashna Jaelre
2021-09-12Remove BLUETOOTH_ENABLE from keyboard-level rules.mk (#14379)Ryan
2021-09-12Remove width, height and key_count from info.json (#14274)Ryan
2021-08-24[Core] Refactor OLED to allow easy addition of other types (#13454)Xelus22
2021-08-06Remove Full Bootmagic (#13846)James Young
2021-07-25[Keyboard] Fix compile size for the Merge UM70 via keymap (#13690)Drashna Jaelre
2021-05-30merge/um70:via: Avoid sprintf() to make the code fit into flash (#12919)Sergey Vlasov
2021-05-292021 May 29 Breaking Changes Update (#13034)James Young
2021-05-14[Keyboard] Add UM-70 (#12556)duoshock
2021-04-20[Keyboard] Update ISO Macro vendor ID to meet VIA requirement (#12564)duoshock
2021-03-24Add UC-1 keypad (#11926)duoshock
2021-03-15Add missing info.json files for keyboards (#12239)James Young
2021-01-13[Keyboard] Add ISO Macro keyboard (#11517)duoshock
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 14:03:19 +0000