scott/InfiniTime
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

resolved merge conflict after renaming PineTimeStyle to WatchFacePineTimeStyle

Browse source
This commit is contained in:
mabuch 2022-04-18 14:35:31 +02:00
commit 82a4f9aa68
30 changed files with 183 additions and 176 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/CMakeLists.txt
View file

@ -449,7 +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
displayapp/screens/settings/SettingBluetooth.cpp
## Watch faces
displayapp/icons/bg_clock.c