diff options
| author | Jean-François Milants <jf@codingfield.com> | 2021-07-24 16:46:52 (GMT) |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2021-07-24 16:46:52 (GMT) |
| commit | 926553d04386341f60eaf8c2abb3f50c65b8fb04 (patch) | |
| tree | 6c40390ff67374d7f072423364533ebc85ccbb63 /src/displayapp/DisplayApp.h | |
| parent | d6cccc2dcd95a7d332ee657d1357ae060389f6e6 (diff) | |
| parent | 95b8a56dd42da067b56e37111577427518d825fb (diff) | |
Merge branch 'fix_touchevent_tap' of git://github.com/Riksu9000/InfiniTime into Riksu9000-fix_touchevent_tap
# Conflicts:
# src/displayapp/DisplayApp.cpp
Diffstat (limited to 'src/displayapp/DisplayApp.h')
| -rw-r--r-- | src/displayapp/DisplayApp.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/displayapp/DisplayApp.h b/src/displayapp/DisplayApp.h index f4573ab..574be63 100644 --- a/src/displayapp/DisplayApp.h +++ b/src/displayapp/DisplayApp.h @@ -102,7 +102,6 @@ namespace Pinetime { TouchModes touchMode = TouchModes::Gestures; - TouchEvents OnTouchEvent(); void RunningState(); void IdleState(); static void Process(void* instance); |