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/CMakeLists.txt | |
| parent | 977faebcb8b26212e0868b30e1af5c38076ff6cb (diff) | |
| parent | 3e9c30a18fb0a0fa7cc69e62821ca0d11e518f47 (diff) | |
Merge with develop and fix conflicts from timaios:set-datetime-manually.
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 37ee0848..69432cf8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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 |