Merge commit '71381457fa'

Conflicts: tmk_core/doc/keymap.md
2016-04-21 14:37:16 +09:00 · 2016-04-21 14:37:16 +09:00 · 53bd4a01be
commit 53bd4a01be
parent 7613efca99 71381457fa
17 changed files with 372 additions and 67 deletions
--- a/tmk_core/common/chibios/bootloader.c
+++ b/tmk_core/common/chibios/bootloader.c
@ -42,5 +42,6 @@ void bootloader_jump(void) {
 #endif /* defined(KIIBOHD_BOOTLOADER) */

 #else /* neither STM32 nor KINETIS */
+__attribute__((weak))
 void bootloader_jump(void) {}
 #endif