merge QMK 0.18.6 (2022-09-10)

manna-harbour / qmk_firmware

See the "forkreadme" branch or the following link for a description of branches maintained in this fork.

GNU General Public License v2.0

281 stars 64 forks source link

Open sunaku opened 2 years ago

sunaku commented 2 years ago

This merges a recent version of QMK mainline and fixes the merge conflicts.

This also serves as the basis for making my other PRs testable by modernizing them to a recent QMK 0.18.6 version, as follows:

See my bilateral-combinations-flashmods-0.18.6 branch for a modernized version of #48.
See my bilateral-combinations-crossover-0.18.6 branch for a modernized version of #54.