darkkirb/qmk_firmware
1
0
Fork 0
forked from mirrors/qmk_firmware
Code Issues Pull requests Projects Releases Packages Wiki Activity
qmk_firmware/keyboards/keebio
History
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
..
bdn9 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
bfo9000 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
choconum Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
chocopad Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
dilly Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
dsp40 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
ergodicity Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
foldkb Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
fourier Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
iris Merge remote-tracking branch 'upstream/master' into develop 2021-08-09 12:14:22 -07:00
kbo5000 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
laplace Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
levinson Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
nyquist Remove backwards compatibility of debounce names (#13877) 2021-08-09 19:46:18 +01:00
quefrency Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
rorschach Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
sinc Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
stick Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
tragicforce68 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
tukey Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
viterbi Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
wavelet Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
wtf60 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00