Jean-François Milants 6d0e68d626 Merge branch 'update_touch_driver' of git://github.com/Riksu9000/InfiniTime into Riksu9000-update_touch_driver ... # Conflicts: # src/displayapp/Apps.h		2021-10-10 16:48:45 +02:00
..
Messages.h	Improve battery percentage calculation and reporting	2021-10-04 01:41:38 +03:00
SystemMonitor.h	Changed access modified indentation	2021-04-24 12:00:45 +03:00
SystemTask.cpp	Merge branch 'update_touch_driver' of git://github.com/Riksu9000/InfiniTime into Riksu9000-update_touch_driver	2021-10-10 16:48:45 +02:00
SystemTask.h	Improve battery percentage calculation and reporting	2021-10-04 01:41:38 +03:00