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

4 years ago · 6d82c92476
parent 7c70a90867 a4c050b5ae
commit 6d82c92476
2 changed files with 6 additions and 6 deletions
--- a/keyboards/bioi/g60/rules.mk
+++ b/keyboards/bioi/g60/rules.mk
@ -7,9 +7,9 @@ F_CPU = 8000000
 # Bootloader selection
 BOOTLOADER = qmk-dfu
-SRC += ../usart.c \
+SRC += usart.c \
-       ../ble.c \
+       ble.c \
-       ../main.c
+       main.c
 OPT_DEFS += -DPROTOCOL_BLE
 OPT_DEFS += -DUART_RX1_BUFFER_SIZE=16 -DUART_TX1_BUFFER_SIZE=16
--- a/keyboards/bioi/morgan65/rules.mk
+++ b/keyboards/bioi/morgan65/rules.mk
@ -7,9 +7,9 @@ F_CPU = 8000000
 # Bootloader selection
 BOOTLOADER = qmk-dfu
-SRC += ../usart.c \
+SRC += usart.c \
-       ../ble.c \
+       ble.c \
-       ../main.c
+       main.c
 OPT_DEFS += -DPROTOCOL_BLE
 OPT_DEFS += -DUART_RX1_BUFFER_SIZE=16 -DUART_TX1_BUFFER_SIZE=16