Merge commit '4d116a04e94cf0d19317d5b44e4fa9f34a3e5594'

author tmk <hasu@tmk-kbd.com>

Tue, 28 Apr 2015 02:27:10 +0000 (11:27 +0900)

committer tmk <hasu@tmk-kbd.com>

Tue, 28 Apr 2015 02:27:10 +0000 (11:27 +0900)
author tmk <hasu@tmk-kbd.com>
Tue, 28 Apr 2015 02:27:10 +0000 (11:27 +0900)
committer tmk <hasu@tmk-kbd.com>
Tue, 28 Apr 2015 02:27:10 +0000 (11:27 +0900)
diff --cc tmk_core/common/keyboard.c
Simple merge
diff --cc tmk_core/protocol.mk
Simple merge
diff --cc tmk_core/protocol/adb.c
Simple merge
diff --cc tmk_core/protocol/adb.h
Simple merge
diff --cc tmk_core/protocol/pjrc.mk
Simple merge
author	tmk <hasu@tmk-kbd.com>
	Tue, 28 Apr 2015 02:27:10 +0000 (11:27 +0900)
committer	tmk <hasu@tmk-kbd.com>
	Tue, 28 Apr 2015 02:27:10 +0000 (11:27 +0900)
		1	2
tmk_core/common/keyboard.c	patch \|	diff1 \|	diff2 \|	blob \| history
tmk_core/protocol.mk	patch \|	diff1 \|	diff2 \|	blob \| history
tmk_core/protocol/adb.c	patch \|	diff1 \|	diff2 \|	blob \| history
tmk_core/protocol/adb.h	patch \|	diff1 \|	diff2 \|	blob \| history
tmk_core/protocol/pjrc.mk	patch \|	diff1 \|	diff2 \|	blob \| history