James Young
7bec943043
Fixes merge conflicts in: - keyboards/bm40hsrgb/config.h - Conflict from PR 13132: - RGB_DISABLE_WHEN_USB_SUSPENDED signature updated in develop branch, unmodified in master branch - updated file with changes from master branch - keyboards/keebio/iris/keymaps/nstickney/keymap.c - Conflict from PR 11456: - layer_state_set_user() updated in develop branch, removed in master branch - updated file with changes from master branch |
2 years ago | |
---|---|---|
.. | ||
default | Support all the 0.2 Ferris variants (#12653) | 2 years ago |
madhatter | Remove Full Bootmagic (#13846) | 2 years ago |
pierrec83 | Support all the 0.2 Ferris variants (#12653) | 2 years ago |
test | Support all the 0.2 Ferris variants (#12653) | 2 years ago |
json2crab.py | Ferris reorganization (#10564) | 3 years ago |