Merge with develop and fix conflicts from timaios:set-datetime-manually.
This commit is contained in:
commit
cf9e149b33
10 changed files with 508 additions and 8 deletions
|
|
@ -433,6 +433,8 @@ list(APPEND SOURCE_FILES
|
|||
displayapp/screens/settings/SettingDisplay.cpp
|
||||
displayapp/screens/settings/SettingSteps.cpp
|
||||
displayapp/screens/settings/SettingPineTimeStyle.cpp
|
||||
displayapp/screens/settings/SettingSetDate.cpp
|
||||
displayapp/screens/settings/SettingSetTime.cpp
|
||||
|
||||
## Watch faces
|
||||
displayapp/icons/bg_clock.c
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue