diff options
| author | Noah Andrews <NoahAndrews@users.noreply.github.com> | 2016-03-29 20:03:22 -0400 |
|---|---|---|
| committer | Noah Andrews <NoahAndrews@users.noreply.github.com> | 2016-03-29 20:03:22 -0400 |
| commit | e28334017c94c6928dd7e82436cec171f0243747 (patch) | |
| tree | d2b2ecb96aff656094b2113f83632e3131000a75 /keyboard/ergodox_ez/keymaps/default_osx/keymap.c | |
| parent | ccf848917b7e931327f6c4a469877e9d8ef238ea (diff) | |
| parent | 26513b497b8bae5160389c0beac2d45cbb29c50f (diff) | |
| download | qmk_firmware-e28334017c94c6928dd7e82436cec171f0243747.tar.gz qmk_firmware-e28334017c94c6928dd7e82436cec171f0243747.zip | |
Merge remote-tracking branch 'jackhumbert/master' into make-keymap-names-consistent
Diffstat (limited to 'keyboard/ergodox_ez/keymaps/default_osx/keymap.c')
| -rw-r--r-- | keyboard/ergodox_ez/keymaps/default_osx/keymap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/keyboard/ergodox_ez/keymaps/default_osx/keymap.c b/keyboard/ergodox_ez/keymaps/default_osx/keymap.c index 9d7364d378..81b49ceff9 100644 --- a/keyboard/ergodox_ez/keymaps/default_osx/keymap.c +++ b/keyboard/ergodox_ez/keymaps/default_osx/keymap.c @@ -158,12 +158,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); |