diff options
| author | dragon788 <dragon788@users.noreply.github.com> | 2015-12-28 14:44:49 -0600 |
|---|---|---|
| committer | dragon788 <dragon788@users.noreply.github.com> | 2015-12-28 14:44:49 -0600 |
| commit | d1f8d0104bd35bb7e812490f474fab3a9aba8fcb (patch) | |
| tree | 5e2af11e4906c99ab893544ddbd0e6e5d1452f95 /keyboard/ergodox_ez/keymaps/keymap_default.c | |
| parent | b61ea5dfaf541dcef695b0c3fc4e4cbfd742a98f (diff) | |
| parent | 981434333689299d8fc6f73979fd3864655430f5 (diff) | |
Merge branch 'master' of github.com:jackhumbert/qmk_firmware
Conflicts:
keyboard/ergodox_ez/keymaps/keymap_default.c
Diffstat (limited to 'keyboard/ergodox_ez/keymaps/keymap_default.c')
| -rw-r--r-- | keyboard/ergodox_ez/keymaps/keymap_default.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/keyboard/ergodox_ez/keymaps/keymap_default.c b/keyboard/ergodox_ez/keymaps/keymap_default.c index 9beadf12f3..b2a318b987 100644 --- a/keyboard/ergodox_ez/keymaps/keymap_default.c +++ b/keyboard/ergodox_ez/keymaps/keymap_default.c @@ -2,7 +2,6 @@ #include "debug.h" #include "action_layer.h" -// TODO: Define layer names that make sense for the ErgoDox EZ. #define BASE 0 // default layer #define SYMB 1 // symbols #define MDIA 2 // media keys @@ -120,7 +119,7 @@ KEYMAP( KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN3, KC_BTN2, + KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2, KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2, KC_TRNS, |