diff options
| author | Jean-François Milants <jf@codingfield.com> | 2022-02-20 14:25:24 (GMT) |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2022-02-20 14:25:24 (GMT) |
| commit | 40cdb547727d99ff140a029ae30980001e4a68f6 (patch) | |
| tree | 6cb5444d40f1d22c1ae14b7eca30cec59c0fa467 /src/CMakeLists.txt | |
| parent | 69e4ab6be101e7993035b56db75f5c32eda713ac (diff) | |
| parent | 319030d9e16e833cf8bff569a9ecfa452165ea27 (diff) | |
Merge branch 'airplane-mode' of https://github.com/evergreen22/InfiniTime into evergreen22-airplane-mode
# Conflicts:
# src/CMakeLists.txt
# src/displayapp/Apps.h
# src/displayapp/DisplayApp.cpp
# src/displayapp/Messages.h
# src/displayapp/screens/settings/Settings.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 5986d95..025fc33 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -449,6 +449,7 @@ list(APPEND SOURCE_FILES displayapp/screens/settings/SettingSetTime.cpp displayapp/screens/settings/SettingChimes.cpp displayapp/screens/settings/SettingShakeThreshold.cpp + displayapp/screens/settings/SettingAirplaneMode.cpp ## Watch faces displayapp/icons/bg_clock.c |