Upstream merge up to 02d44beb44

2019-07-11 23:21:18 -07:00
parent a0fac849eb
commit 441b212c86
4854 changed files with 157576 additions and 41541 deletions
--- a/quantum/process_keycode/process_tap_dance.h
+++ b/quantum/process_keycode/process_tap_dance.h
@@ -27,6 +27,7 @@ typedef struct
  uint8_t oneshot_mods;
  uint8_t weak_mods;
  uint16_t keycode;
+  uint16_t interrupting_keycode;
  uint16_t timer;
  bool interrupted;
  bool pressed;