Jean-François Milants fbe964ff44 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		2022-09-27 21:59:22 +02:00
..
Settings.cpp	Apply clang-format to all C++ files	2022-06-05 09:15:46 +03:00
Settings.h	Merge branch 'watchface-casio-digital-G7710' of github.com:ITCactus/InfiniTime into ITCactus-watchface-casio-digital-G7710	2022-09-27 21:59:22 +02:00