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
|
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 |
|
tmk
|
1a02ebcc61
|
Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core'
|
2015-04-10 01:32:04 +09:00 |
|