diff options
author | Stick <nstickney@gmail.com> | 2017-04-03 16:59:27 -0500 |
---|---|---|
committer | Stick <nstickney@gmail.com> | 2017-04-03 16:59:27 -0500 |
commit | bee9183e7fae7c739b9c42dd4dc759783ac80e46 (patch) | |
tree | 690f17486c2e57175bbd36152d685ebedc7c9439 /keyboards | |
parent | b6280d0cac59c741db62a63072efd5de4887fc01 (diff) | |
parent | 3ac9259742bfd428f71c31dbf2bfedace2a7f91b (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'keyboards')
132 files changed, 7787 insertions, 448 deletions
diff --git a/keyboards/atreus/keymaps/default/keymap.c b/keyboards/atreus/keymaps/default/keymap.c index 04ad66fed8..ce92e89c9c 100644 --- a/keyboards/atreus/keymaps/default/keymap.c +++ b/keyboards/atreus/keymaps/default/keymap.c @@ -15,8 +15,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QW] = { /* Qwerty */ {KC_Q, KC_W, KC_E, KC_R, KC_T, KC_TRNS, KC_Y, KC_U, KC_I, KC_O, KC_P }, {KC_A, KC_S, KC_D, KC_F, KC_G, KC_TRNS, KC_H, KC_J, KC_K, KC_L, KC_SCLN }, - {KC_Z, KC_X, KC_C, KC_V, |