IBNobody ec62d9e85c Merge remote-tracking branch 'refs/remotes/jackhumbert/master' ...

# Conflicts:
#	quantum/template/template.c
#	quantum/template/template.h

2016-03-22 20:39:05 -05:00

..

avr

Remove led_off() it is not used

2016-01-24 11:13:11 +01:00

mbed

Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core'

2015-04-10 01:32:04 +09:00

action_code.h

Fix parenthesis

2015-09-12 11:26:37 +09:00

action_layer.c

Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core'

2015-04-10 01:32:04 +09:00

action_layer.h

Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core'

2015-04-10 01:32:04 +09:00

action_macro.c

Fix weak modifier clear in action macro

2015-09-12 11:25:41 +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

core: Fix for disabling NKRO in Boot protocol

2015-09-20 14:34:13 +09:00

action_util.h

Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core'

2015-04-10 01:32:04 +09:00

action.c

Fixes rolling combos for mod-tap keys

2015-10-28 04:19:13 +02:00

action.h

Revert "Make action_for_key a weak symbol"

2015-05-21 20:30:10 +09:00

backlight.c

Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core'

2015-04-10 01:32:04 +09:00

backlight.h

Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core'

2015-04-10 01:32:04 +09:00

bootloader.h

Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core'

2015-04-10 01:32:04 +09:00

bootmagic.c

Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core'

2015-04-10 01:32:04 +09:00

bootmagic.h

Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core'

2015-04-10 01:32:04 +09:00

command.c

core: Fix NKRO ifdef

2015-09-24 01:35:10 +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

Change to KC_BOOTLOADER(KC_BTLD)

2015-09-16 13:01:06 +09:00

keymap.c

merging tmk

2015-10-27 12:42:30 -04:00

keymap.h

Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core'

2015-04-10 01:32:04 +09:00

led.h

Adding LED function pointers

2016-03-15 23:52:51 -05:00

matrix.h

Addressed void* return warning in all keymaps

2016-03-10 11:28:34 -05: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 commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core'

2015-04-10 01:32:04 +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