diff options
| author | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-03-22 17:29:31 -0400 |
|---|---|---|
| committer | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-03-22 17:29:31 -0400 |
| commit | a4ff9f256738cf637553e7840d53f778d791fb6f (patch) | |
| tree | 91d327587401e69843eecb353e97a3119aa9939b /keyboard/ergodox_ez/keymaps/erez_experimental/keymap.c | |
| parent | e36a441274e9e494e1d8e38df1901f3acf9def27 (diff) | |
| parent | 403d756ad56de18488e3d048e849c55e77a20b32 (diff) | |
| download | qmk_firmware-a4ff9f256738cf637553e7840d53f778d791fb6f.tar.gz qmk_firmware-a4ff9f256738cf637553e7840d53f778d791fb6f.zip | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'keyboard/ergodox_ez/keymaps/erez_experimental/keymap.c')
| -rw-r--r-- | keyboard/ergodox_ez/keymaps/erez_experimental/keymap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/keyboard/ergodox_ez/keymaps/erez_experimental/keymap.c b/keyboard/ergodox_ez/keymaps/erez_experimental/keymap.c index 20c95f1ee0..24ff1c6884 100644 --- a/keyboard/ergodox_ez/keymaps/erez_experimental/keymap.c +++ b/keyboard/ergodox_ez/keymaps/erez_experimental/keymap.c @@ -156,12 +156,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); |