keychron_qmk_firmware/keyboards/handwired
James Young 345f6dc4e6
Merge remote-tracking branch 'upstream/master' into develop
Fixes merge conflicts in:

- keyboards/poker87c/rules.mk and keyboards/poker87d/rules.mk
  - Conflicts from PR 13961
- keyboards/tronguylabs/m122_3270/keymaps/default/keymap.c
  - Conflict from PR 13947
2021-08-11 09:48:25 -07:00
..
2x5keypad Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
3dp660 Merge remote-tracking branch 'upstream/master' into develop 2021-08-11 09:48:25 -07:00
6key Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
6macro Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
42 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
108key_trackpoint Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
412_64 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
aek64 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
aim65 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
amigopunk Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
angel Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
aplx2 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
aranck Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
arrow_pad Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
atreus50 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
axon Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
bdn9_ble Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
bento Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
bigmac Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
bolek Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
boss566y/redragon_vara Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
brain Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
cans12er Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
chiron Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
ck4x4 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
cmd60 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
co60 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
colorlice Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
concertina Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
consolekeyboard Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
curiosity Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
d48 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
dactyl Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
dactyl_left Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
dactyl_manuform Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
dactyl_promicro Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
dactyl_rah Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
daishi Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
datahand Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
ddg_56 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
eagleii Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
ergocheap Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
evk Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
fc200rt_qmk Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
fivethirteen Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
floorboard Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
frankie_macropad Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
frenchdev Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
freoduo Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
fruity60 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
gamenum Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
hacked_motospeed Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
heisenberg Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
hexon38 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
hnah40 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
hnah40rgb Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
hnah108 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
ibm122m Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
ibm_wheelwriter Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
jn68m Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
jopr Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
jot50 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
jotanck Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
jotpad16 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
jtallbean Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
juliet Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
k8split Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
k_numpad17 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
kbod Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
ks63 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
lagrange Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
leftynumpad Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
lovelive9 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
magicforce61 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
magicforce68 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
marauder Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
mechboards_micropad Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
minorca Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
ms_sculpt_mobile Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
myskeeb Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
nicekey Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
not_so_minidox Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
novem Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
numpad20 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
obuwunkunubi/spaget Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
oem_ansi_fullsize [Keyboard] add handwired/oem_ansi_fullsize (#13857) 2021-08-06 23:51:03 -07:00
oem_iso_fullsize Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
onekey Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
ortho5x13 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
ortho5x14 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
owlet60 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
p65rgb Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
pilcrow Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
pill60 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
postageboard Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
prime_exl Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
prime_exl_plus Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
prkl30 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
promethium Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
pterodactyl Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
pteron Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
pteron38 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
pteron44 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
pytest
qc60 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
reddot Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
retro_refit Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
riblee_f401 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
riblee_f411 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
rs60 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
selene Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
sick68 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
sick_pad Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
slash Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
sono1 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
space_oddity Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
split89 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
splittest Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
steamvan Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
sticc14 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
stream_cheap Handwired/Stream_Cheap/2x4: Add via support (#13297) 2021-08-11 07:40:30 +10:00
swiftrax Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
symmetric70_proto Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
symmetry60 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
t111 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
tennie Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
terminus_mini Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
trackpoint Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
tractyl_manuform [Keymap] Drashna split transport improvement (#13905) 2021-08-07 21:40:48 -07:00
traveller Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
tritium_numpad Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
twadlee/tp69 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
unicomp_mini_m Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
unk Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
videowriter Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
wabi Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
woodpad Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
wulkan Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
xealous Remove backwards compatibility of debounce names (#13877) 2021-08-09 19:46:18 +01:00
xealousbrown [Keyboard] Fix matrix_output_unselect_delay for handwired/xealousbrown (#13913) 2021-08-08 01:36:38 +10:00
z150 Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00
zergo Remove Full Bootmagic (#13846) 2021-08-06 23:59:56 -07:00