Merge branch 'master' of https://github.com/sboesebeck/qmk_firmware

diff --git a/keyboard/ergodox_ez/keymaps/osx_de/keymap.c b/keyboard/ergodox_ez/keymaps/osx_de/keymap.c
index 269e7a0fbd62eb9abab284c5a0de227c56644861..dffcb21da3db485d84fa30f05160419b0fc40d61 100644 (file)
--- a/keyboard/ergodox_ez/keymaps/osx_de/keymap.c
+++ b/keyboard/ergodox_ez/keymaps/osx_de/keymap.c
@@ -17,6 +17,7 @@
 #define M_DE_OSX_CIRC_CTRLCMD 13
 #define M_TOGGLE_5 14
 #define M_CTL_SFT_HASH 15
+#define M_LGUI_SHFT 16
 
 #define SM_SMILE 4
 #define SM_SMIRK 5
@@ -313,6 +314,13 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
                        }
                }
                break;
+       case M_LGUI_SHFT:
+               if (record->event.pressed){
+                       return MACRO(D(LGUI),D(LSFT),END);
+               }else{
+                       return MACRO(U(LGUI),U(LSFT),END);
+               }
+               break;
        case M_CTL_SFT_HASH:
                if (record->event.pressed) {
                        start=timer_read();