diff options
| author | Jean-François Milants <jf@codingfield.com> | 2021-10-10 16:01:43 +0200 |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2021-10-10 16:01:43 +0200 |
| commit | cf9e149b33885c67c84697a9b422e123c090bc72 (patch) | |
| tree | c59c322655180d670ebaa3a47e9686eaada5eff7 /src/displayapp/Apps.h | |
| parent | 977faebcb8b26212e0868b30e1af5c38076ff6cb (diff) | |
| parent | 3e9c30a18fb0a0fa7cc69e62821ca0d11e518f47 (diff) | |
Merge with develop and fix conflicts from timaios:set-datetime-manually.
Diffstat (limited to 'src/displayapp/Apps.h')
| -rw-r--r-- | src/displayapp/Apps.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/displayapp/Apps.h b/src/displayapp/Apps.h index e3aca8cf..25acc105 100644 --- a/src/displayapp/Apps.h +++ b/src/displayapp/Apps.h @@ -32,7 +32,9 @@ namespace Pinetime { SettingDisplay, SettingWakeUp, SettingSteps, - SettingPineTimeStyle + SettingPineTimeStyle, + SettingSetDate, + SettingSetTime }; } } |