diff options
| author | IBNobody <protospherex@gmail.com> | 2016-03-23 02:39:05 +0100 |
|---|---|---|
| committer | IBNobody <protospherex@gmail.com> | 2016-03-23 02:39:05 +0100 |
| commit | ec62d9e85cab5cf166241b0536120d005fa7c898 (patch) | |
| tree | 5b2a544070d80833bb7668ffc34dc3143b62a3d5 /tmk_core | |
| parent | 8a2457d7534ba082b52599e3af56f9e50e8dc38a (diff) | |
| parent | 403d756ad56de18488e3d048e849c55e77a20b32 (diff) | |
| download | qmk_firmware-ec62d9e85cab5cf166241b0536120d005fa7c898.tar.gz qmk_firmware-ec62d9e85cab5cf166241b0536120d005fa7c898.tar.xz | |
Merge remote-tracking branch 'refs/remotes/jackhumbert/master'
# Conflicts:
# quantum/template/template.c
# quantum/template/template.h
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/common/matrix.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tmk_core/common/matrix.h b/tmk_core/common/matrix.h index 85415df71..0b013fc98 100644 --- a/tmk_core/common/matrix.h +++ b/tmk_core/common/matrix.h @@ -64,8 +64,8 @@ void matrix_power_up(void); void matrix_power_down(void); /* keyboard-specific setup/loop functionality */ -void * matrix_init_kb(void); -void * matrix_scan_kb(void); +void matrix_init_kb(void); +void matrix_scan_kb(void); #ifdef __cplusplus } |