diff options
| author | Jean-François Milants <jf@codingfield.com> | 2022-09-11 14:59:49 +0200 |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2022-09-11 14:59:49 +0200 |
| commit | ada2c09581d2d13acfa5ce9a97671c0ec17863f1 (patch) | |
| tree | 2f776adc59d0c63e403d2043cb8460e65d6c46fe /images/v0.3.0 | |
| parent | 18cff286c75f432095db4b188e0f9a8a9e2bd8e8 (diff) | |
| parent | c9a5c3fa5c930a5939d3114a6c6b48570d61ca24 (diff) | |
Merge branch 'develop' into infineat-external-resources
# Conflicts:
# src/displayapp/screens/Symbols.h
# src/displayapp/screens/settings/SettingWatchFace.cpp
# src/displayapp/screens/settings/SettingWatchFace.h
Diffstat (limited to 'images/v0.3.0')
| -rw-r--r-- | images/v0.3.0/Gauge.jpg | bin | 2237900 -> 0 bytes |
| -rw-r--r-- | images/v0.3.0/Helloworld.jpg | bin | 2334850 -> 0 bytes |
| -rw-r--r-- | images/v0.3.0/Meter.jpg | bin | 2207746 -> 0 bytes |
| -rw-r--r-- | images/v0.3.0/Version.jpg | bin | 2852866 -> 0 bytes |
| -rw-r--r-- | images/v0.3.0/Watchface.jpg | bin | 1899555 -> 0 bytes |
| -rw-r--r-- | images/v0.3.0/Watchface2.jpg | bin | 2411819 -> 0 bytes |
| -rw-r--r-- | images/v0.3.0/menu.jpg | bin | 2362011 -> 0 bytes |
7 files changed, 0 insertions, 0 deletions
diff --git a/images/v0.3.0/Gauge.jpg b/images/v0.3.0/Gauge.jpg Binary files differdeleted file mode 100644 index aa12a01c..00000000 --- a/images/v0.3.0/Gauge.jpg +++ /dev/null diff --git a/images/v0.3.0/Helloworld.jpg b/images/v0.3.0/Helloworld.jpg Binary files differdeleted file mode 100644 index b3b09009..00000000 --- a/images/v0.3.0/Helloworld.jpg +++ /dev/null diff --git a/images/v0.3.0/Meter.jpg b/images/v0.3.0/Meter.jpg Binary files differdeleted file mode 100644 index a2c28e14..00000000 --- a/images/v0.3.0/Meter.jpg +++ /dev/null diff --git a/images/v0.3.0/Version.jpg b/images/v0.3.0/Version.jpg Binary files differdeleted file mode 100644 index d126d741..00000000 --- a/images/v0.3.0/Version.jpg +++ /dev/null diff --git a/images/v0.3.0/Watchface.jpg b/images/v0.3.0/Watchface.jpg Binary files differdeleted file mode 100644 index 1cfaa976..00000000 --- a/images/v0.3.0/Watchface.jpg +++ /dev/null diff --git a/images/v0.3.0/Watchface2.jpg b/images/v0.3.0/Watchface2.jpg Binary files differdeleted file mode 100644 index 63783051..00000000 --- a/images/v0.3.0/Watchface2.jpg +++ /dev/null diff --git a/images/v0.3.0/menu.jpg b/images/v0.3.0/menu.jpg Binary files differdeleted file mode 100644 index bf94a2e5..00000000 --- a/images/v0.3.0/menu.jpg +++ /dev/null |
