Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
3af97ef6a2
45 changed files with 208 additions and 2 deletions
|
@ -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!
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue