diff options
author | Jean-François Milants <jf@codingfield.com> | 2021-01-20 21:34:09 +0100 |
---|---|---|
committer | Jean-François Milants <jf@codingfield.com> | 2021-01-20 21:34:09 +0100 |
commit | 522a1eb0beaabb607b1f123993ec2f09be8a775b (patch) | |
tree | 419bfe41495e6a2e56334db41990ba2fb6d33f16 /src/displayapp/Apps.h | |
parent | a0f2fa8469f3a2c0f5f2f914ad174029da321cc0 (diff) |
Merge branch piggz/nav into develop:
- fix conflict
- add a icon for the navigation app.
Diffstat (limited to 'src/displayapp/Apps.h')
-rw-r--r-- | src/displayapp/Apps.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/displayapp/Apps.h b/src/displayapp/Apps.h index fcadf2a2..69aedb37 100644 --- a/src/displayapp/Apps.h +++ b/src/displayapp/Apps.h @@ -2,6 +2,6 @@ namespace Pinetime { namespace Applications { - enum class Apps {None, Launcher, Clock, SysInfo, Meter, Gauge, Brightness, Music, FirmwareValidation, Paint, Paddle, Notifications, Twos, HeartRate}; + enum class Apps {None, Launcher, Clock, SysInfo, Meter, Gauge, Brightness, Music, FirmwareValidation, Paint, Paddle, Notifications, Twos, HeartRate, Navigation}; } } |