Conflicts:
	tmk_core/doc/keymap.md
This commit is contained in:
tmk 2016-04-21 14:37:16 +09:00
commit 53bd4a01be
17 changed files with 372 additions and 67 deletions

View file

@ -10,6 +10,7 @@ OBJECTS += \
$(OBJDIR)/common/print.o \
$(OBJDIR)/common/debug.o \
$(OBJDIR)/common/util.o \
$(OBJDIR)/common/hook.o \
$(OBJDIR)/common/mbed/suspend.o \
$(OBJDIR)/common/mbed/timer.o \
$(OBJDIR)/common/mbed/xprintf.o \