Merge commit '71381457fa1311dfa0b58ba882a96db740640871'
authortmk <hasu@tmk-kbd.com>
Thu, 21 Apr 2016 05:37:16 +0000 (14:37 +0900)
committertmk <hasu@tmk-kbd.com>
Thu, 21 Apr 2016 05:37:16 +0000 (14:37 +0900)
commit53bd4a01be5c4327462e6c6620ea7670eddca6f2
tree620cf118972720755e103b31b64e32535d7719fa
parent7613efca999f1b0b90c57cedfa67eda1161b8d44
parent71381457fa1311dfa0b58ba882a96db740640871
Merge commit '71381457fa1311dfa0b58ba882a96db740640871'

Conflicts:
tmk_core/doc/keymap.md
17 files changed:
tmk_core/common.mk
tmk_core/common/action.c
tmk_core/common/action_layer.c
tmk_core/common/bootmagic.c
tmk_core/common/chibios/bootloader.c
tmk_core/common/chibios/sleep_led.c
tmk_core/common/hook.c
tmk_core/common/hook.h
tmk_core/common/keyboard.c
tmk_core/doc/keymap.md
tmk_core/protocol/chibios/README.md
tmk_core/protocol/chibios/main.c
tmk_core/protocol/chibios/usb_main.c
tmk_core/protocol/lufa/lufa.c
tmk_core/tool/chibios/chibios.mk
tmk_core/tool/chibios/common.mk
tmk_core/tool/mbed/common.mk
Imprint / Impressum