Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge upstream master to 2022 Q4 breaking change | lokher | 2022-12-07 | 5 | -191/+0 |
| | |||||
* | Merge upstream master | lokher | 2022-12-06 | 5 | -0/+191 |
|\ | |||||
| * | Reworked backlight keycodes. (#18961) | Nick Brassel | 2022-11-06 | 2 | -2/+2 |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
| * | Remove legacy Grave Escape keycodes (#18787) | Ryan | 2022-10-20 | 3 | -3/+3 |
| | | |||||
| * | Remove legacy keycodes, part 5 (#18710) | Ryan | 2022-10-15 | 1 | -1/+1 |
| | | | | | | | | | | * `KC_SLCK` -> `KC_SCRL` * `KC_NLCK` -> `KC_NUM` | ||||
* | | Remove non-Keychron keyboards | lokher | 2022-09-13 | 13 | -1121/+0 |
|/ | |||||
* | RESET -> QK_BOOT user keymaps (#17940) | Joel Challis | 2022-08-21 | 1 | -1/+1 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-08-07 | 5 | -5/+5 |
|\ | |||||
| * | RESET -> QK_BOOT default keymaps (#17939) | Joel Challis | 2022-08-07 | 5 | -5/+5 |
| | | |||||
* | | Remove `UNUSED_PINS` (#17931) | Nick Brassel | 2022-08-06 | 1 | -2/+0 |
|/ | |||||
* | Move keyboard USB IDs and strings to data driven: C (#17789) | Ryan | 2022-07-26 | 2 | -7/+6 |
| | |||||
* | Add missing QMK Configurator layout data for chlx str.merro60 (#17518) | James Young | 2022-06-30 | 1 | -0/+141 |
| | | | | | * add LAYOUT_60_ansi_split_bs_rshift layout data * add LAYOUT_60_iso layout data | ||||
* | [Keyboard] Add str.merro60 pcb (#17097) | chalex | 2022-05-30 | 13 | -0/+983 |
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Alexander Lee <aclee3@CGHan-Macbook-2015.local> Co-authored-by: chalex <chlxbsmt@gmail.com> |