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

2020-12-27 17:37:04 +00:00 · 2020-12-27 17:37:04 +00:00 · 99d6349978
commit 99d6349978
parent 0c5be869ff 1b7b72c0e9
40 changed files with 40 additions and 61 deletions
--- a/tmk_core/protocol/chibios.mk
+++ b/tmk_core/protocol/chibios.mk
@ -18,4 +18,3 @@ OPT_DEFS += -DFIXED_NUM_CONFIGURATIONS=1
 ifeq ($(strip $(MIDI_ENABLE)), yes)
  include $(TMK_PATH)/protocol/midi.mk
 endif
-