Kai Ryu
55c3937ca0
Merge remote-tracking branch 'upstream/master'
2016-06-14 13:33:26 +09:00
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
flabbergast
cb663eeca6
Move declaration of keymap_config.
...
Should really not declare variables in .h files - since it's included
in different .c files, a proper linker then complains that the same
variable is declared more than once (once for each .c file that the
offending .h is included in).
2015-10-12 09:46:48 +01:00
flabbergast
d9652cdf99
Make bootmagic.c code portable (_delay_ms -> wait_ms).
2015-10-12 09:40:06 +01:00
flabbergast
be9be90483
Modularity and gcc warnings fixes.
2015-09-07 21:33:06 +01: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
