Merge remote-tracking branch 'origin/master' into develop
3 files changed, 3 insertions(+), 3 deletions(-) M keyboards/handwired/aball/keymaps/default/keymap.c M keyboards/ploopyco/trackball_nano/keymaps/default/keymap.c M keyboards/ploopyco/trackball_nano/keymaps/maddie/keymap.c
M keyboards/handwired/aball/keymaps/default/keymap.c => keyboards/handwired/aball/keymaps/default/keymap.c +1 -1
@@ 16,4 16,4 @@ #include QMK_KEYBOARD_H // Dummy const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {{ KC_NO }}; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {{{ KC_NO }}};
M keyboards/ploopyco/trackball_nano/keymaps/default/keymap.c => keyboards/ploopyco/trackball_nano/keymaps/default/keymap.c +1 -1
@@ 21,4 21,4 @@ // safe range starts at `PLOOPY_SAFE_RANGE` instead. // Dummy const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {{ KC_NO }}; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {{{ KC_NO }}};
M keyboards/ploopyco/trackball_nano/keymaps/maddie/keymap.c => keyboards/ploopyco/trackball_nano/keymaps/maddie/keymap.c +1 -1
@@ 25,7 25,7 @@ int8_t delta_x = 0; int8_t delta_y = 0; // Dummy const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {{ KC_NO }}; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {{{ KC_NO }}}; void process_mouse_user(report_mouse_t *mouse_report, int8_t x, int8_t y) { if (scroll_enabled) {