1
0
Commit Graph

4 Commits

Author SHA1 Message Date
Kai Ryu
55c3937ca0 Merge remote-tracking branch 'upstream/master' 2016-06-14 13:33:26 +09:00
tmk
6f5e8ce17e usb_usb: Support locking key indicator LED 2015-07-15 15:13:15 +09:00
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
tmk
1a02ebcc61 Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core' 2015-04-10 01:32:04 +09:00