Merge branch piggz/nav into develop:

- fix conflict - add a icon for the navigation app.
2021-01-20 21:34:09 +01:00 · 2021-01-20 21:34:09 +01:00 · 522a1eb0be
commit 522a1eb0be
parent a0f2fa8469
280 changed files with 10934 additions and 384 deletions
--- a/src/displayapp/screens/Symbols.h
+++ b/src/displayapp/screens/Symbols.h
@ -25,6 +25,7 @@ namespace Pinetime {
        static constexpr const char* asterisk = "\xEF\x81\xA9";
        static constexpr const char* paintbrush = "\xEF\x87\xBC";
        static constexpr const char* paddle = "\xEF\x91\x9D";
+        static constexpr const char* map = "\xEF\x96\xa0";
      }
    }
  }