summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-01-10 22:16:06 +0000
committerQMK Bot <hello@qmk.fm>2021-01-10 22:16:06 +0000
commitc8320726bd3a3bec480f02b6f6e1bc4d32008973 (patch)
tree7a3e9483a9c174cb5c3f29cec044483f0ac7d25f
parenteaa9106ec74591593e638ac015a5c90d17b30612 (diff)
parentd58d7dd1921d6b2993c663d8d46afccf44356e3e (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/zinc/keymaps/via/readme_en.md2
-rw-r--r--tmk_core/common/action_tapping.h8
2 files changed, 5 insertions, 5 deletions
diff --git a/keyboards/zinc/keymaps/via/readme_en.md b/keyboards/zinc/keymaps/via/readme_en.md
index c49a434162..3c73a18d88 100644
--- a/keyboards/zinc/keymaps/via/readme_en.md
+++ b/keyboards/zinc/keymaps/via/readme_en.md
@@ -1,4 +1,4 @@
-# The VIA Zinc Layout
+# The VIA Zinc Layout
## layout
### Qwerty
diff --git a/tmk_core/common/action_tapping.h b/tmk_core/common/action_tapping.h
index 4d10c668af..893ccb1ce1 100644
--- a/tmk_core/common/action_tapping.h
+++ b/tmk_core/common/action_tapping.h
@@ -34,8 +34,8 @@ uint16_t get_event_keycode(keyevent_t event, bool update_layer_cache);
void action_tapping_process(keyrecord_t record);
uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record);
-bool get_permissive_hold(uint16_t keycode, keyrecord_t *record);
-bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record);
-bool get_tapping_force_hold(uint16_t keycode, keyrecord_t *record);
-bool get_retro_tapping(uint16_t keycode, keyrecord_t *record);
+bool get_permissive_hold(uint16_t keycode, keyrecord_t *record);
+bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record);
+bool get_tapping_force_hold(uint16_t keycode, keyrecord_t *record);
+bool get_retro_tapping(uint16_t keycode, keyrecord_t *record);
#endif