diff options
| author | JF <jf@codingfield.com> | 2020-08-14 17:54:43 (GMT) |
|---|---|---|
| committer | JF <jf@codingfield.com> | 2020-08-14 17:54:43 (GMT) |
| commit | e6f5ab7b9145e842708611cc5b13066f89a1673d (patch) | |
| tree | 421d23a9b963459276b7a462f009462d50d36dbc /src/DisplayApp/DisplayApp.h | |
| parent | bbfc20c3ff4b741cd21b162389905a59a8e22f3f (diff) | |
| parent | 32f20fa994fec9e21d2af4d7bd287b94316b3970 (diff) | |
Merge develop and fix conflicts.
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 6af9cf2..a6df95c 100644 --- a/src/DisplayApp/DisplayApp.h +++ b/src/DisplayApp/DisplayApp.h @@ -19,6 +19,7 @@ #include <Components/Ble/NotificationManager.h> #include <Components/FirmwareValidator/FirmwareValidator.h> #include "TouchEvents.h" +#include "Apps.h" namespace Pinetime { @@ -43,7 +44,6 @@ namespace Pinetime { void Start(); void PushMessage(Messages msg); - enum class Apps {None, Launcher, Clock, SysInfo, Meter, Gauge, Brightness, Music}; void StartApp(Apps app); void SetFullRefresh(FullRefreshDirections direction); |