diff options
| author | Jean-François Milants <jf@codingfield.com> | 2022-09-27 21:59:22 +0200 |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2022-09-27 21:59:22 +0200 |
| commit | fbe964ff44fc61fec33b89d56803125d79a12d1d (patch) | |
| tree | 1ea59db4fd671b349c2b37fd95f5ce73c805ff68 /src/displayapp/screens/settings | |
| parent | 63932810d2707e6c530dae64b209ac240137dc17 (diff) | |
| parent | 50b98798b9df370f685e95079f63f7d4e2dbbcde (diff) | |
Merge branch 'watchface-casio-digital-G7710' of github.com:ITCactus/InfiniTime into ITCactus-watchface-casio-digital-G7710
# Conflicts:
# src/components/settings/Settings.h
# src/displayapp/screens/CheckboxList.cpp
# src/displayapp/screens/CheckboxList.h
# src/displayapp/screens/Clock.cpp
# src/displayapp/screens/Clock.h
# src/displayapp/screens/settings/SettingWatchFace.cpp
Diffstat (limited to 'src/displayapp/screens/settings')
| -rw-r--r-- | src/displayapp/screens/settings/SettingWatchFace.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/displayapp/screens/settings/SettingWatchFace.cpp b/src/displayapp/screens/settings/SettingWatchFace.cpp index bd2f349c..411cc898 100644 --- a/src/displayapp/screens/settings/SettingWatchFace.cpp +++ b/src/displayapp/screens/settings/SettingWatchFace.cpp @@ -49,7 +49,7 @@ std::unique_ptr<Screen> SettingWatchFace::CreateScreen1() { } std::unique_ptr<Screen> SettingWatchFace::CreateScreen2() { - std::array<const char*, 4> watchfaces {"Infineat face", "", "", ""}; + std::array<const char*, 4> watchfaces {"Infineat face", "Casio G7710", "", ""}; return std::make_unique<Screens::CheckboxList>(1, 2, app, |