Merge branch 'fix_touchevent_tap' of git://github.com/Riksu9000/InfiniTime into Riksu9000-fix_touchevent_tap

# Conflicts:
#	src/displayapp/DisplayApp.cpp
This commit is contained in:
Jean-François Milants
2021-07-24 18:46:52 +02:00
4 changed files with 33 additions and 40 deletions

View File

@@ -102,7 +102,6 @@ namespace Pinetime {
TouchModes touchMode = TouchModes::Gestures;
TouchEvents OnTouchEvent();
void RunningState();
void IdleState();
static void Process(void* instance);