summaryrefslogtreecommitdiff
path: root/keyboards/merge
Commit message (Expand)AuthorAge
* Remove RGBLIGHT_ANIMATION and clean up effect defines for L-Q (#18727)Drashna Jaelre2022-10-15
* Change `DRIVER_LED_COUNT` to `{LED,RGB}_MATRIX_LED_COUNT` (#18399)Ryan2022-09-23
* Merge remote-tracking branch 'origin/master' into developDrashna Jael're2022-08-20
|\
| * RESET -> QK_BOOT keyboard readme (#18110)Joel Challis2022-08-20
* | Remove `UNUSED_PINS` (#17931)Nick Brassel2022-08-06
|/
* Move keyboard USB IDs and strings to data driven: M (#17859)Ryan2022-08-03
* merge/um80 - Fix WPM issues in configurator builds (#17608)Joel Challis2022-07-09
* Add keyboard 'UM-80' (#17035)duoshock2022-07-03
* merge/uma - Resolve configurator issues (#16551)Joel Challis2022-03-06
* [Keyboard] Add UM-A Keyboard (#15584)duoshock2022-01-13
* Tidy up NKRO_ENABLE rules (#15382)Ryan2021-12-09
* Tidy up `SLEEP_LED_ENABLE` rules (#15362)Ryan2021-12-01
* Remove `BOOTMAGIC_ENABLE = lite` option (#15002)James Young2021-11-05
* [Core] Change OLED task function to be boolean (#14864)Drashna Jaelre2021-11-02
* Remove BLUETOOTH_ENABLE from keyboard-level rules.mk (#14379)Ryan2021-09-12
* Remove width, height and key_count from info.json (#14274)Ryan2021-09-12
* [Core] Refactor OLED to allow easy addition of other types (#13454)Xelus222021-08-24
* Remove Full Bootmagic (#13846)James Young2021-08-06
* [Keyboard] Fix compile size for the Merge UM70 via keymap (#13690)Drashna Jaelre2021-07-25
* merge/um70:via: Avoid sprintf() to make the code fit into flash (#12919)Sergey Vlasov2021-05-30
* 2021 May 29 Breaking Changes Update (#13034)James Young2021-05-29
* [Keyboard] Add UM-70 (#12556)duoshock2021-05-14
* [Keyboard] Update ISO Macro vendor ID to meet VIA requirement (#12564)duoshock2021-04-20
* Add UC-1 keypad (#11926)duoshock2021-03-24
* Add missing info.json files for keyboards (#12239)James Young2021-03-15
* [Keyboard] Add ISO Macro keyboard (#11517)duoshock2021-01-13
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-26 15:18:11 +0000