1
0
This repo is archived. You can view files and clone it, but cannot push or open issues or pull requests.
tmk_keyboard_custom/tmk_core/common
Kai Ryu 432b1df3e4 Merge remote-tracking branch 'tmk_keyboard/master' into exp
Conflicts:
	common.mk
	common/action.c
	common/avr/suspend.c
	common/command.c
	common/keyboard.c
	keyboard/gh60/Makefile
	keyboard/gh60/Makefile.pjrc
2015-05-22 18:42:17 +09:00
..
avr Add keyboard_setup() and matrix_setup() 2015-05-19 00:39:43 +09:00
mbed Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core' 2015-04-10 01:32:04 +09:00
action_code.h Remove unneeded tap delays #201 2015-04-23 20:18:01 +09:00
action_layer.c Merge remote-tracking branch 'tmk_keyboard/master' into exp 2015-05-22 18:42:17 +09:00
action_layer.h Merge remote-tracking branch 'tmk_keyboard/master' into exp 2015-05-22 18:42:17 +09:00
action_macro.c Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core' 2015-04-10 01:32:04 +09:00
action_macro.h Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core' 2015-04-10 01:32:04 +09:00
action_tapping.c Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core' 2015-04-10 01:32:04 +09:00
action_tapping.h Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core' 2015-04-10 01:32:04 +09:00
action_util.c Merge remote-tracking branch 'tmk_keyboard/master' into exp 2015-05-22 18:42:17 +09:00
action_util.h Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core' 2015-04-10 01:32:04 +09:00
action.c Remove unneeded tap delays #201 2015-04-23 20:18:01 +09:00
action.h Merge remote-tracking branch 'tmk_keyboard/master' into exp 2015-05-22 18:42:17 +09:00
backlight.c Merge remote-tracking branch 'tmk_keyboard/master' into exp 2015-05-22 18:42:17 +09:00
backlight.h Merge remote-tracking branch 'tmk_keyboard/master' into exp 2015-05-22 18:42:17 +09:00
bootloader.h Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core' 2015-04-10 01:32:04 +09:00
bootmagic.c Merge remote-tracking branch 'tmk_keyboard/master' into exp 2015-05-22 18:42:17 +09:00
bootmagic.h Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core' 2015-04-10 01:32:04 +09:00
command.c Reduce code size of magic commands 2015-05-13 15:29:30 +09:00
command.h Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core' 2015-04-10 01:32:04 +09:00
debug.c Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core' 2015-04-10 01:32:04 +09:00
debug.h Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core' 2015-04-10 01:32:04 +09:00
eeconfig.h Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core' 2015-04-10 01:32:04 +09:00
host_driver.h Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core' 2015-04-10 01:32:04 +09:00
host.c Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core' 2015-04-10 01:32:04 +09:00
host.h Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core' 2015-04-10 01:32:04 +09:00
keyboard.c Add keyboard_setup() and matrix_setup() 2015-05-19 00:39:43 +09:00
keyboard.h Add keyboard_setup() and matrix_setup() 2015-05-19 00:39:43 +09:00
keycode.h Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core' 2015-04-10 01:32:04 +09:00
keymap.c Revert "Make action_for_key a weak symbol" 2015-05-21 20:30:10 +09:00
keymap.h Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core' 2015-04-10 01:32:04 +09:00
led.h Merge remote-tracking branch 'tmk_keyboard/master' into exp 2015-05-22 18:42:17 +09:00
matrix.h Add keyboard_setup() and matrix_setup() 2015-05-19 00:39:43 +09:00
mousekey.c Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core' 2015-04-10 01:32:04 +09:00
mousekey.h Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core' 2015-04-10 01:32:04 +09:00
nodebug.h Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core' 2015-04-10 01:32:04 +09:00
print.c Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core' 2015-04-10 01:32:04 +09:00
print.h Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core' 2015-04-10 01:32:04 +09:00
progmem.h Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core' 2015-04-10 01:32:04 +09:00
report.h Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core' 2015-04-10 01:32:04 +09:00
sendchar_null.c Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core' 2015-04-10 01:32:04 +09:00
sendchar_uart.c Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core' 2015-04-10 01:32:04 +09:00
sendchar.h Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core' 2015-04-10 01:32:04 +09:00
sleep_led.c Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core' 2015-04-10 01:32:04 +09:00
sleep_led.h Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core' 2015-04-10 01:32:04 +09:00
suspend.h Merge remote-tracking branch 'tmk_keyboard/master' into exp 2015-05-22 18:42:17 +09:00
timer.h Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core' 2015-04-10 01:32:04 +09:00
uart.c Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core' 2015-04-10 01:32:04 +09:00
uart.h Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core' 2015-04-10 01:32:04 +09:00
util.c Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core' 2015-04-10 01:32:04 +09:00
util.h Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core' 2015-04-10 01:32:04 +09:00
wait.h Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core' 2015-04-10 01:32:04 +09:00