1
0
Fork 0

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

This commit is contained in:
Zach White 2021-01-30 13:15:13 -08:00
commit 3af97ef6a2
45 changed files with 208 additions and 2 deletions

View file

@ -317,6 +317,9 @@ ifneq ("$(wildcard $(USER_PATH)/post_config.h)","")
POST_CONFIG_H += $(USER_PATH)/post_config.h
endif
# Disable features that a keyboard doesn't support
-include disable_features.mk
# Object files directory
# To put object files in current directory, use a dot (.), do NOT make
# this an empty or blank macro!