ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:jackhumbert/qmk_firmware

Browse source 
Conflicts:
	keyboard/ergodox_ez/keymaps/keymap_default.c
This commit is contained in:
dragon788 2015-12-28 14:44:49 -06:00
commit d1f8d0104b
21 changed files with 6076 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
keyboard/ergodox_ez/keymaps/keymap_default.c
View file

@ -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,