From: tmk <hasu@tmk-kbd.com>
Date: Thu, 21 Apr 2016 05:37:16 +0000 (+0900)
Subject: Merge commit '71381457fa1311dfa0b58ba882a96db740640871'
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=53bd4a01be5c4327462e6c6620ea7670eddca6f2;p=max%2Ftmk_keyboard.git

Merge commit '71381457fa1311dfa0b58ba882a96db740640871'

Conflicts:
	tmk_core/doc/keymap.md
---

53bd4a01be5c4327462e6c6620ea7670eddca6f2
diff --cc tmk_core/common/bootmagic.c
index 61236bec,056806f2..eb06d787
--- a/tmk_core/common/bootmagic.c
+++ b/tmk_core/common/bootmagic.c
@@@ -41,14 -41,17 +42,17 @@@ void bootmagic(void
          bootloader_jump();
      }
  
+     /* user-defined checks */
+     hook_bootmagic();
+ 
      /* debug enable */
      debug_config.raw = eeconfig_read_debug();
 -    if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEBUG_ENABLE)) {
 -        if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEBUG_MATRIX)) {
 +    if (bootmagic_scan_key(BOOTMAGIC_KEY_DEBUG_ENABLE)) {
 +        if (bootmagic_scan_key(BOOTMAGIC_KEY_DEBUG_MATRIX)) {
              debug_config.matrix = !debug_config.matrix;
 -        } else if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEBUG_KEYBOARD)) {
 +        } else if (bootmagic_scan_key(BOOTMAGIC_KEY_DEBUG_KEYBOARD)) {
              debug_config.keyboard = !debug_config.keyboard;
 -        } else if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEBUG_MOUSE)) {
 +        } else if (bootmagic_scan_key(BOOTMAGIC_KEY_DEBUG_MOUSE)) {
              debug_config.mouse = !debug_config.mouse;
          } else {
              debug_config.enable = !debug_config.enable;
diff --cc tmk_core/common/hook.c
index 00000000,204407b7..204407b7
mode 000000,100644..100644
--- a/tmk_core/common/hook.c
+++ b/tmk_core/common/hook.c
diff --cc tmk_core/common/hook.h
index 00000000,ff569d49..ff569d49
mode 000000,100644..100644
--- a/tmk_core/common/hook.h
+++ b/tmk_core/common/hook.h