From: tmk <hasu@tmk-kbd.com>
Date: Sun, 22 May 2016 13:49:29 +0000 (+0900)
Subject: Merge commit '20b787fc1284176834cbe7ca2134e4b36bec5828'
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=3fe8e1c238fc8e15dacda1b03c0c1745a7b8e8e7;p=max%2Ftmk_keyboard.git

Merge commit '20b787fc1284176834cbe7ca2134e4b36bec5828'
---

3fe8e1c238fc8e15dacda1b03c0c1745a7b8e8e7
diff --cc tmk_core/doc/hook.txt
index 00000000,1689034e..1689034e
mode 000000,100644..100644
--- a/tmk_core/doc/hook.txt
+++ b/tmk_core/doc/hook.txt