Merge remote-tracking branch 'flabbergast-tmk_keyboard/chibios'

author tmk <hasu@tmk-kbd.com>

Tue, 9 Feb 2016 20:31:43 +0000 (05:31 +0900)

committer tmk <hasu@tmk-kbd.com>

Tue, 9 Feb 2016 20:31:43 +0000 (05:31 +0900)
author tmk <hasu@tmk-kbd.com>
Tue, 9 Feb 2016 20:31:43 +0000 (05:31 +0900)
committer tmk <hasu@tmk-kbd.com>
Tue, 9 Feb 2016 20:31:43 +0000 (05:31 +0900)
diff --cc tmk_core/common.mk
Simple merge
diff --cc tmk_core/common/action_tapping.c
Simple merge
author	tmk <hasu@tmk-kbd.com>
	Tue, 9 Feb 2016 20:31:43 +0000 (05:31 +0900)
committer	tmk <hasu@tmk-kbd.com>
	Tue, 9 Feb 2016 20:31:43 +0000 (05:31 +0900)
		1	2
tmk_core/common.mk	patch \|	diff1 \|	diff2 \|	blob \| history
tmk_core/common/action_tapping.c	patch \|	diff1 \|	diff2 \|	blob \| history