7 commits

Author	SHA1	Message	Date
Jack Humbert	547da78335	merging tmk	2015-10-27 12:42:30 -04:00
tmk	498654fc4c	Change to KC_BOOTLOADER(KC_BTLD)	2015-09-16 13:01:06 +09:00
skullY	bb8c1d29fa	Add an assignable RESET key	2015-09-16 12:35:21 +09:00
tmk	5b46031658	Revert "Make action_for_key a weak symbol" ... This reverts commit c17b8a599e. The commit made compile error and its intention is unclear.	2015-05-21 20:30:10 +09:00
Dan McGregor	c17b8a599e	Make action_for_key a weak symbol	2015-05-19 11:29:28 -07:00
Jun Wako	7c3f14b7bb	Fix handling of consumer usage #199	2015-04-23 17:02:28 +09:00
tmk	1a02ebcc61	Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core'	2015-04-10 01:32:04 +09:00