Merge branch 'modstaptoggle' of git://github.com/simonmelhart/tmk_keyboard into simon...

Conflicts:
	common/action_code.h

diff --cc common/action.c
Simple merge

diff --cc common/action_code.h
index b08d36124e5b06d4b881bb43bd7fbd97910e808b,bd3652e38013071cebaecd0de2984f544d6b9692..8df86b11929e5afa8de07edb839c39d69defa6f3
--- 1/common/action_code.h
--- 2/common/action_code.h
+++ b/common/action_code.h
@@@ -205,12 -206,14 +206,14 @@@ enum mods_bit 
  };
  enum mods_codes {
      MODS_ONESHOT = 0x00,
+     MODS_TAP_TOGGLE = 0x01,
  };
  #define ACTION_KEY(key)                 ACTION(ACT_MODS, (key))
 -#define ACTION_MODS(mods)               ACTION(ACT_MODS, (mods&0x1f)<<8 | 0)
 -#define ACTION_MODS_KEY(mods, key)      ACTION(ACT_MODS, (mods&0x1f)<<8 | (key))
 -#define ACTION_MODS_TAP_KEY(mods, key)  ACTION(ACT_MODS_TAP, (mods&0x1f)<<8 | (key))
 -#define ACTION_MODS_ONESHOT(mods)       ACTION(ACT_MODS_TAP, (mods&0x1f)<<8 | MODS_ONESHOT)
 -#define ACTION_MODS_TAP_TOGGLE(mods)    ACTION(ACT_MODS_TAP, (mods&0x1f)<<8 | MODS_TAP_TOGGLE)
 +#define ACTION_MODS(mods)               ACTION(ACT_MODS, ((mods)&0x1f)<<8 | 0)
 +#define ACTION_MODS_KEY(mods, key)      ACTION(ACT_MODS, ((mods)&0x1f)<<8 | (key))
 +#define ACTION_MODS_TAP_KEY(mods, key)  ACTION(ACT_MODS_TAP, ((mods)&0x1f)<<8 | (key))
 +#define ACTION_MODS_ONESHOT(mods)       ACTION(ACT_MODS_TAP, ((mods)&0x1f)<<8 | MODS_ONESHOT)
++#define ACTION_MODS_TAP_TOGGLE(mods)    ACTION(ACT_MODS_TAP, ((mods)&0x1f)<<8 | MODS_TAP_TOGGLE)
  
  
  /*