ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
qmk_firmware/keyboards/ferris/keymaps
History
Exact
James Young 7bec943043
Merge remote-tracking branch 'upstream/master' into develop 
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
2021-08-09 12:14:22 -07:00
..
default Support all the 0.2 Ferris variants (#12653) 2021-08-09 11:23:15 -07:00
madhatter Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
pierrec83 Support all the 0.2 Ferris variants (#12653) 2021-08-09 11:23:15 -07:00
test Support all the 0.2 Ferris variants (#12653) 2021-08-09 11:23:15 -07:00
json2crab.py Ferris reorganization (#10564) 2020-10-17 12:20:34 -07:00