summaryrefslogtreecommitdiffstats
path: root/keyboards/chlx/str_merro60/keymaps
Commit message (Collapse)AuthorAgeFilesLines
* Merge upstream master to 2022 Q4 breaking changelokher2022-12-075-191/+0
|
* Merge upstream masterlokher2022-12-065-0/+191
|\
| * Reworked backlight keycodes. (#18961)Nick Brassel2022-11-062-2/+2
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
| * Remove legacy Grave Escape keycodes (#18787)Ryan2022-10-203-3/+3
| |
| * Remove legacy keycodes, part 5 (#18710)Ryan2022-10-151-1/+1
| | | | | | | | | | * `KC_SLCK` -> `KC_SCRL` * `KC_NLCK` -> `KC_NUM`
* | Remove non-Keychron keyboardslokher2022-09-137-229/+0
|/
* RESET -> QK_BOOT user keymaps (#17940)Joel Challis2022-08-211-1/+1
|
* RESET -> QK_BOOT default keymaps (#17939)Joel Challis2022-08-075-5/+5
|
* [Keyboard] Add str.merro60 pcb (#17097)chalex2022-05-307-0/+229
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>
[cgit] Unable to lock slot /tmp/cgit/be100000.lock: Permission denied (13)