diff options
| author | Jean-François Milants <jf@codingfield.com> | 2021-02-23 21:18:59 +0100 |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2021-02-23 21:18:59 +0100 |
| commit | f864330d355172046fab0923fd9015ec52884f00 (patch) | |
| tree | 0fd8743c9ea357d6f3ac61949292187113d3867f /src/displayapp/DisplayApp.h | |
| parent | 324c7dab326ea23a6c8502bbb8c6e9b9d87a839f (diff) | |
| parent | 3fe3f06299b37b99cad117e0ec726735acbdc721 (diff) | |
Merge branch 'LVGL7' of https://github.com/joaquimorg/Pinetime into joaquimorg-LVGL7
# Conflicts:
# src/CMakeLists.txt
# src/displayapp/DisplayApp.cpp
# src/displayapp/screens/Modal.cpp
# src/displayapp/screens/Modal.h
# src/displayapp/screens/Notifications.cpp
# src/displayapp/screens/Tile.h
Diffstat (limited to 'src/displayapp/DisplayApp.h')
| -rw-r--r-- | src/displayapp/DisplayApp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/displayapp/DisplayApp.h b/src/displayapp/DisplayApp.h index 077cbba0..c38404ba 100644 --- a/src/displayapp/DisplayApp.h +++ b/src/displayapp/DisplayApp.h @@ -9,7 +9,7 @@ #include "TouchEvents.h" #include "components/brightness/BrightnessController.h" #include "components/firmwarevalidator/FirmwareValidator.h" -#include "displayapp/screens/Modal.h" +#include "displayapp/screens/Screen.h" namespace Pinetime { |