summary refs log tree commit diff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-05-17 05:05:36 +0000
committerQMK Bot <hello@qmk.fm>2022-05-17 05:05:36 +0000
commit7541e75c3e257fce7c7b507fc958fa84e19fa265 (patch)
tree16a6a13b1299acce49fdf29ac8567bda7dc81cb6
parent978e2fcd14e4d597d5140fe1642568bd6626d773 (diff)
parente9e83b4da73e5594b1f864d78529e85aa5ebefe9 (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/ml/gas75/info.json2
-rw-r--r--keyboards/mss_studio/m64_rgb/keymaps/default/keymap.c2
-rw-r--r--keyboards/mss_studio/m64_rgb/keymaps/via/keymap.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/keyboards/ml/gas75/info.json b/keyboards/ml/gas75/info.json
index 3cb3d912f5..42899cc091 100644
--- a/keyboards/ml/gas75/info.json
+++ b/keyboards/ml/gas75/info.json
@@ -36,7 +36,7 @@
                 {"label":"0)", "x":10, "y":1.25},
                 {"label":"-_", "x":11, "y":1.25},
                 {"label":"=+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25, "w":2},
                 {"label":"Home", "x":15.25, "y":1.25},
 
                 {"label":"Tab", "x":0, "y":2.25, "w":1.5},
diff --git a/keyboards/mss_studio/m64_rgb/keymaps/default/keymap.c b/keyboards/mss_studio/m64_rgb/keymaps/default/keymap.c
index a5892b3825..da5c7c40c3 100644
--- a/keyboards/mss_studio/m64_rgb/keymaps/default/keymap.c
+++ b/keyboards/mss_studio/m64_rgb/keymaps/default/keymap.c
@@ -77,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                 KC_ESC,  KC_1,    KC_2,    KC_3, KC_4, KC_5,   KC_6, KC_7, KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
                 KC_TAB,  KC_Q,    KC_W,    KC_E, KC_R, KC_T,   KC_Y, KC_U, KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
                 KC_CAPS, KC_A,    KC_S,    KC_D, KC_F, KC_G,   KC_H, KC_J, KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
-                KC_LSFT, KC_Z,    KC_X,    KC_C, KC_V, KC_B,   KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_SLSH,
+                KC_LSFT, KC_Z,    KC_X,    KC_C, KC_V, KC_B,   KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_DEL,
                 KC_LCTL, KC_LGUI, KC_LALT,             KC_SPC,                      KC_RALT, MO(_FN), KC_LEFT, KC_DOWN, KC_RIGHT
             ),
 
diff --git a/keyboards/mss_studio/m64_rgb/keymaps/via/keymap.c b/keyboards/mss_studio/m64_rgb/keymaps/via/keymap.c
index a5892b3825..da5c7c40c3 100644
--- a/keyboards/mss_studio/m64_rgb/keymaps/via/keymap.c
+++ b/keyboards/mss_studio/m64_rgb/keymaps/via/keymap.c
@@ -77,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                 KC_ESC,  KC_1,    KC_2,    KC_3, KC_4, KC_5,   KC_6, KC_7, KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
                 KC_TAB,  KC_Q,    KC_W,    KC_E, KC_R, KC_T,   KC_Y, KC_U, KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
                 KC_CAPS, KC_A,    KC_S,    KC_D, KC_F, KC_G,   KC_H, KC_J, KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
-                KC_LSFT, KC_Z,    KC_X,    KC_C, KC_V, KC_B,   KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_SLSH,
+                KC_LSFT, KC_Z,    KC_X,    KC_C, KC_V, KC_B,   KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_DEL,
                 KC_LCTL, KC_LGUI, KC_LALT,             KC_SPC,                      KC_RALT, MO(_FN), KC_LEFT, KC_DOWN, KC_RIGHT
             ),