diff options
author | Wojciech Siewierski <wojciech.siewierski@onet.pl> | 2016-04-03 11:14:08 +0200 |
---|---|---|
committer | Wojciech Siewierski <wojciech.siewierski@onet.pl> | 2016-04-03 11:23:00 +0200 |
commit | 47dd29513eeec7b7f639bef6df441a905ce8bacb (patch) | |
tree | 29170847273e786384bd3d7c7781e67dc4335bbb /keyboard/ergodox_ez/keymaps/german/keymap.c | |
parent | 8ef14d09b8451b3f2a77e6f019922eae0ac43642 (diff) | |
parent | 8d39263d2444f0273327902684c802b218efb7b6 (diff) |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware into modifier-release-fix
Diffstat (limited to 'keyboard/ergodox_ez/keymaps/german/keymap.c')
-rw-r--r-- | keyboard/ergodox_ez/keymaps/german/keymap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/keyboard/ergodox_ez/keymaps/german/keymap.c b/keyboard/ergodox_ez/keymaps/german/keymap.c index d91f1e9373..7ec8d99cc0 100644 --- a/keyboard/ergodox_ez/keymaps/german/keymap.c +++ b/keyboard/ergodox_ez/keymaps/german/keymap.c @@ -157,12 +157,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); |