From 522a1eb0beaabb607b1f123993ec2f09be8a775b Mon Sep 17 00:00:00 2001 From: Jean-François Milants Date: Wed, 20 Jan 2021 21:34:09 +0100 Subject: Merge branch piggz/nav into develop: - fix conflict - add a icon for the navigation app. --- src/displayapp/Apps.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/displayapp/Apps.h') 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}; } } -- cgit v1.2.3-70-g09d2