Merge branch 'develop' into new_touch_handler
This commit is contained in:
commit
a1ba187c47
32 changed files with 270 additions and 178 deletions
|
|
@ -27,7 +27,7 @@ QuickSettings::QuickSettings(Pinetime::Applications::DisplayApp* app,
|
|||
batteryController {batteryController},
|
||||
dateTimeController {dateTimeController},
|
||||
brightness {brightness},
|
||||
motorController{motorController},
|
||||
motorController {motorController},
|
||||
settingsController {settingsController} {
|
||||
|
||||
// Time
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue