Merge branch 'rn42' into merge_rn42
authortmk <nobody@nowhere>
Mon, 24 Nov 2014 04:50:33 +0000 (13:50 +0900)
committertmk <nobody@nowhere>
Mon, 24 Nov 2014 04:50:33 +0000 (13:50 +0900)
commit363950982a291c3bfa03ac6362061b1d37dc06b0
treec46fc53fe00137ced3c8edd3d0766ee844f77516
parenteb90ed6238426db9367e294abfaefb5de07564f5
parent60096e11c77980ca6b54674c5b68248e8aa15d8d
Merge branch 'rn42' into merge_rn42

Conflicts:
.gitignore
common.mk
common/debug_config.h
common/print.h
.gitignore
common.mk
common/action.c
common/avr/xprintf.h
common/debug.h
common/keyboard.c
protocol.mk
Imprint / Impressum