summaryrefslogtreecommitdiffstats
path: root/keyboards/chlx/merro60/keymaps/via
Commit message (Expand)AuthorAgeFilesLines
* Merge upstream master to 2022 Q4 breaking changelokher2022-12-071-51/+0
* Merge upstream masterlokher2022-12-061-0/+51
|\
| * Reworked backlight keycodes. (#18961)Nick Brassel2022-11-061-1/+1
* | Remove non-Keychron keyboardslokher2022-09-132-54/+0
|/
* RESET -> QK_BOOT default keymaps (#17037)Joel Challis2022-05-151-1/+1
* Merro60 Layout Macro Refactor (#13827)James Young2021-07-311-4/+4
* [Keyboard] Add merro60 (#12527)chalex2021-05-152-0/+54