diff options
| author | Jean-François Milants <jf@codingfield.com> | 2021-04-09 19:16:21 (GMT) |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2021-04-09 19:16:21 (GMT) |
| commit | 15b3b8e282dd5b2132b0095716cd9d88740d4579 (patch) | |
| tree | c26870103f8baaa933399cfb86cca25aa7e60d8b /src/displayapp/icons/navigation/merge-slight-right-white.svg | |
| parent | 9ac4be8b759bb2cedeb999ce5e87d983261beded (diff) | |
| parent | 57b4c3f0edc6acfa31bd2160abdcd6091920ba63 (diff) | |
Merge branch 'develop' into motion-sensor
# Conflicts:
# src/CMakeLists.txt
# src/displayapp/Apps.h
# src/displayapp/DisplayApp.cpp
# src/displayapp/DisplayApp.h
# src/displayapp/lv_pinetime_theme.c
# src/displayapp/screens/ApplicationList.cpp
# src/drivers/TwiMaster.cpp
# src/systemtask/SystemTask.h
Diffstat (limited to 'src/displayapp/icons/navigation/merge-slight-right-white.svg')
| -rw-r--r-- | src/displayapp/icons/navigation/merge-slight-right-white.svg | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/displayapp/icons/navigation/merge-slight-right-white.svg b/src/displayapp/icons/navigation/merge-slight-right-white.svg deleted file mode 100644 index 16f15fc..0000000 --- a/src/displayapp/icons/navigation/merge-slight-right-white.svg +++ /dev/null @@ -1,4 +0,0 @@ -<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"> - <title>direction</title> - <path fill="#ffffff" d="M11.79221,9.2v8.29515a0.3052,0.3052,0,0,1-.30484.30486h-0.9903a0.3052,0.3052,0,0,1-.30484-0.30486V9.2h1.6m0.2-.2h-2v8.49515A0.50484,0.50484,0,0,0,10.49707,18h0.9903a0.50486,0.50486,0,0,0,.50485-0.50485V9h0Zm3.91806-1.66406L11.00659,0.9931,6.10284,7.33594a0.38659,0.38659,0,0,0,.40942.62354L9.46411,6.61572a0.35723,0.35723,0,0,1,.54224.376L10.008,9.02783a4.65641,4.65641,0,0,1-2.44824,3.957L3.2549,15.66667a0.50285,0.50285,0,0,0-.16089.69275L3.61977,17.2031a0.50277,0.50277,0,0,0,.69263.16089l4.31083-2.68528A6.60115,6.60115,0,0,0,12.00555,8.9585V6.9931h0.001A0.35757,0.35757,0,0,1,12.549,6.61572l2.95184,1.34375A0.38659,0.38659,0,0,0,15.91028,7.33594Z"/> -</svg> |
