Zach White ac3b7d79e0 Merge remote-tracking branch 'origin/master' into develop ...

Resolved Conflicts:
    keyboards/kc60/rules.mk
    keyboards/xd96/rules.mk
    lib/python/qmk/cli/__init__.py

2020-11-22 08:28:53 -08:00

..

arm_atsam/packs

…

chibios @ 313416b8fd

…

chibios-contrib @ e3a3a24047

…

googletest @ ec44c6c167

…

lib8tion

…

lufa @ ce10f7642b

…

printf @ d3b984684b

2020 May 30 Breaking Changes Update (#9215)

2020-05-30 13:14:59 -07:00

python

Merge remote-tracking branch 'origin/master' into develop

2020-11-22 08:28:53 -08:00

ugfx @ 40b48f470a

…

vusb @ bdb53e4c04

Update vusb to match 3rd endpoint. (#9020)

2020-08-29 14:30:02 -07:00