diff options
| author | Jean-François Milants <jf@codingfield.com> | 2021-10-10 16:48:45 +0200 |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2021-10-10 16:48:45 +0200 |
| commit | 6d0e68d6260044dcce09ebf879a48e314987f808 (patch) | |
| tree | ef9f0325f56fb22f7ce4a79321b61ad5da415a46 /src/displayapp/Apps.h | |
| parent | 92aeae73dee5bb16f669806621a9b735f2b0ce07 (diff) | |
| parent | f61e88b8425f9edcd38e47027df62dcc56c83adc (diff) | |
Merge branch 'update_touch_driver' of git://github.com/Riksu9000/InfiniTime into Riksu9000-update_touch_driver
# Conflicts:
# src/displayapp/Apps.h
Diffstat (limited to 'src/displayapp/Apps.h')
| -rw-r--r-- | src/displayapp/Apps.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/displayapp/Apps.h b/src/displayapp/Apps.h index 25acc105..d340efee 100644 --- a/src/displayapp/Apps.h +++ b/src/displayapp/Apps.h @@ -34,7 +34,8 @@ namespace Pinetime { SettingSteps, SettingPineTimeStyle, SettingSetDate, - SettingSetTime + SettingSetTime, + Error, }; } } |