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/CMakeLists.txt | |
| 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/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0bcb788f..e59c0d81 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -430,6 +430,7 @@ list(APPEND SOURCE_FILES displayapp/screens/WatchFaceInfineat.cpp displayapp/screens/WatchFaceTerminal.cpp displayapp/screens/WatchFacePineTimeStyle.cpp + displayapp/screens/WatchFaceCasioStyleG7710.cpp ## |