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 /quantum/template/template.h | |
| 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 'quantum/template/template.h')
| -rw-r--r-- | quantum/template/template.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/quantum/template/template.h b/quantum/template/template.h index ed17ca001..ba91abac3 100644 --- a/quantum/template/template.h +++ b/quantum/template/template.h @@ -19,8 +19,8 @@ { k10, KC_NO, k11 }, \ } -void * matrix_init_user(void); -void * matrix_scan_user(void); -void * led_set_user(uint8_t usb_led); +void matrix_init_user(void); +void matrix_scan_user(void); +void led_set_user(uint8_t usb_led); #endif
\ No newline at end of file |