Merge commit '4d116a04e94cf0d19317d5b44e4fa9f34a3e5594'
authortmk <hasu@tmk-kbd.com>
Tue, 28 Apr 2015 02:27:10 +0000 (11:27 +0900)
committertmk <hasu@tmk-kbd.com>
Tue, 28 Apr 2015 02:27:10 +0000 (11:27 +0900)
1  2 
tmk_core/common/keyboard.c
tmk_core/protocol.mk
tmk_core/protocol/adb.c
tmk_core/protocol/adb.h
tmk_core/protocol/pjrc.mk

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Imprint / Impressum