diff options
| author | Jean-François Milants <jf@codingfield.com> | 2021-12-02 21:42:56 +0100 |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2021-12-02 21:42:56 +0100 |
| commit | 1404d0186c83d2d805bb5daa1f2de84c52e59b42 (patch) | |
| tree | 315cd89d4183180aa3d1ec66ab73dc454c68c933 /src/Version.h.in | |
| parent | a17d8bd566ae7686b9373dc3f2ab218d3a191630 (diff) | |
| parent | 75f0bbb7ca51fa0aa65c8c3d4081a5e8d8d48c55 (diff) | |
Merge branch 'paint-colorchange-vibration' of git://github.com/clemensvonmolo/InfiniTime into clemensvonmolo-paint-colorchange-vibration
# Conflicts:
# src/displayapp/screens/InfiniPaint.h
Diffstat (limited to 'src/Version.h.in')
0 files changed, 0 insertions, 0 deletions