diff options
| author | Stephan Bösebeck <stephan.boesebeck@holidayinsider.com> | 2016-03-24 08:22:21 +0100 |
|---|---|---|
| committer | Stephan Bösebeck <stephan.boesebeck@holidayinsider.com> | 2016-03-24 08:22:21 +0100 |
| commit | 8b883c797fc043def3abe5c367cb9d9a6f11f8fb (patch) | |
| tree | fa0d91fd40de1db1ab744bce880a4cbe2bbc8b5e /keyboard/ergodox_ez/ergodox_ez.h | |
| parent | 55fa66428ca9b75106b8a296ea6095f7b80cc109 (diff) | |
| parent | ba058f8b81132bf64b1aa263779629b8a6c18c23 (diff) | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
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); |