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/keymaps/ordinary/keymap.c | |
| parent | 55fa66428ca9b75106b8a296ea6095f7b80cc109 (diff) | |
| parent | ba058f8b81132bf64b1aa263779629b8a6c18c23 (diff) | |
| download | qmk_firmware-8b883c797fc043def3abe5c367cb9d9a6f11f8fb.tar.gz qmk_firmware-8b883c797fc043def3abe5c367cb9d9a6f11f8fb.tar.xz | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'keyboard/ergodox_ez/keymaps/ordinary/keymap.c')
| -rw-r--r-- | keyboard/ergodox_ez/keymaps/ordinary/keymap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/keyboard/ergodox_ez/keymaps/ordinary/keymap.c b/keyboard/ergodox_ez/keymaps/ordinary/keymap.c index d44962b0d..3343c2296 100644 --- a/keyboard/ergodox_ez/keymaps/ordinary/keymap.c +++ b/keyboard/ergodox_ez/keymaps/ordinary/keymap.c @@ -161,12 +161,12 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) }; // Runs just one time when the keyboard initializes. -void * matrix_init_user(void) { +void matrix_init_user(void) { }; // Runs constantly in the background, in a loop. -void * matrix_scan_user(void) { +void matrix_scan_user(void) { uint8_t layer = biton32(layer_state); |