Jean-François Milants bef3e708f6 Merge branch 'ShakeWake' of https://github.com/geekbozu/InfiniTime into geekbozu-ShakeWake ... # Conflicts: # src/CMakeLists.txt # src/displayapp/Apps.h # src/displayapp/DisplayApp.cpp # src/displayapp/screens/settings/Settings.cpp		2022-01-04 21:48:08 +01:00
..
Settings.cpp	Update includes to to be relative to src directory	2021-11-15 22:02:49 +01:00
Settings.h	Merge branch 'ShakeWake' of https://github.com/geekbozu/InfiniTime into geekbozu-ShakeWake	2022-01-04 21:48:08 +01:00