CCF_100/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge with develop and fix conflicts from timaios:set-datetime-manually.

Browse Source
This commit is contained in:
Jean-François Milants
2021-10-10 16:01:43 +02:00
parent 977faebcb8 3e9c30a18f
commit cf9e149b33
10 changed files with 508 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@@ -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