Merge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7

This commit is contained in:
Jack Humbert
2016-11-28 23:51:07 -05:00
22 changed files with 1415 additions and 56 deletions

View File

@@ -213,6 +213,7 @@ endif
VPATH += $(KEYBOARD_PATH)
VPATH += $(COMMON_VPATH)
include $(TMK_PATH)/protocol.mk
include $(TMK_PATH)/common.mk
SRC += $(TMK_COMMON_SRC)