diff options
| author | IBNobody <protospherex@gmail.com> | 2016-03-22 20:39:05 -0500 |
|---|---|---|
| committer | IBNobody <protospherex@gmail.com> | 2016-03-22 20:39:05 -0500 |
| commit | ec62d9e85cab5cf166241b0536120d005fa7c898 (patch) | |
| tree | 5b2a544070d80833bb7668ffc34dc3143b62a3d5 /keyboard/ergodox_ez/ergodox_ez.h | |
| parent | 8a2457d7534ba082b52599e3af56f9e50e8dc38a (diff) | |
| parent | 403d756ad56de18488e3d048e849c55e77a20b32 (diff) | |
Merge remote-tracking branch 'refs/remotes/jackhumbert/master'
# Conflicts:
# quantum/template/template.c
# quantum/template/template.h
Diffstat (limited to 'keyboard/ergodox_ez/ergodox_ez.h')
| -rw-r--r-- | keyboard/ergodox_ez/ergodox_ez.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/keyboard/ergodox_ez/ergodox_ez.h b/keyboard/ergodox_ez/ergodox_ez.h index aceb7ed9c3..1e446baf6f 100644 --- a/keyboard/ergodox_ez/ergodox_ez.h +++ b/keyboard/ergodox_ez/ergodox_ez.h @@ -123,8 +123,8 @@ inline void ergodox_led_all_set(uint8_t n) { k0D, k1D, k2D, k3D, k4D, KC_NO } \ } -void * matrix_init_user(void); -void * matrix_scan_user(void); +void matrix_init_user(void); +void matrix_scan_user(void); |