From: Stephan BoĢˆsebeck Date: Sat, 2 Apr 2016 13:15:21 +0000 (+0200) Subject: Merge branch 'master' of https://github.com/sboesebeck/qmk_firmware X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f0424a0c0fa4153234ad6979929e5a2426c86f21;p=qmk_firmware.git Merge branch 'master' of https://github.com/sboesebeck/qmk_firmware --- f0424a0c0fa4153234ad6979929e5a2426c86f21 diff --cc keyboard/ergodox_ez/keymaps/osx_de/keymap.c index a1b47ae8b,269e7a0fb..dffcb21da --- a/keyboard/ergodox_ez/keymaps/osx_de/keymap.c +++ b/keyboard/ergodox_ez/keymaps/osx_de/keymap.c @@@ -13,11 -13,10 +13,11 @@@ #define M_CTRL_CMDV 1 #define M_CTRL_CMDC 2 #define M_MEH_SH_ACUT 3 - #define M_DE_PLUS_CTRLALT 12 - #define M_DE_CIRC_CTRLCMD 13 + #define M_DE_OSX_PLUS_CTRLALT 12 + #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