From: dragon788 <github@deik.me>
Date: Sun, 27 Dec 2015 19:15:03 +0000 (-0600)
Subject: Merge branch 'master' of github.com:dragon788/qmk_firmware_ez
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=01dc8b32448c811aa41ba67cd818a369bcb2dd96;p=qmk_firmware.git

Merge branch 'master' of github.com:dragon788/qmk_firmware_ez

Conflicts:
	keyboard/ergodox_ez/keymaps/keymap_default.c
---

01dc8b32448c811aa41ba67cd818a369bcb2dd96
diff --cc keyboard/ergodox_ez/keymaps/keymap_default.c
index 762e118b0,9beadf12f..b2a318b98
--- a/keyboard/ergodox_ez/keymaps/keymap_default.c
+++ b/keyboard/ergodox_ez/keymaps/keymap_default.c
@@@ -119,10 -120,10 +119,10 @@@ 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_TRNS, KC_TRNS, KC_TRNS,
+                                   KC_BTN1, KC_BTN2, KC_TRNS,
      // right hand
         KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,