1
0
Commit Graph

12 Commits

Author SHA1 Message Date
tmk
53bd4a01be Merge commit '71381457fa1311dfa0b58ba882a96db740640871'
Conflicts:
	tmk_core/doc/keymap.md
2016-04-21 14:37:16 +09:00
tmk
5e9b21d77d core: Actionmap support 2016-03-03 16:18:19 +09:00
tmk
83a3de38b7 Merge commit '5a0132f1c1c9a14fd2941f0a5e29bbf5e31da20c' into master-core-pull 2016-02-12 14:38:49 +09:00
tmk
72b1668340 Merge remote-tracking branch 'flabbergast-tmk_keyboard/chibios'
Merge flabbergast's chibios protocol into master
https://github.com/flabbergast/tmk_keyboard/tree/chibios
2016-02-10 05:31:43 +09:00
Kai Ryu
42d5d64306 core: Speed up compilation 2016-01-22 10:47:10 +09:00
flabbergast
b1b30f1675 Merge remote-tracking branch 'upstream/master' into chibios 2016-01-18 07:36:39 +00:00
tmk
fb1fb122a5 Merge pull request #230 from jerryen/master
Add KEYBOARD_LOCK_ENABLE to makefile
2016-01-16 11:17:13 +09:00
flabbergast
7d4f3dd5a1 Move AVR specific sleep_led.c into avr. 2015-09-10 10:30:49 +01:00
flabbergast
be9be90483 Modularity and gcc warnings fixes. 2015-09-07 21:33:06 +01:00
tmk
8746ad98cc core: Add keymap section ldscript for ATMega32U2 2015-07-12 05:44:10 +09:00
jerryen
0c40b669f0 Add KEYBOARD_LOCK_ENABLE to makefile
Allow keyboard lock to work
2015-06-27 21:37:09 -07:00
tmk
1a02ebcc61 Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core' 2015-04-10 01:32:04 +09:00