Jean-François Milants 9f67e6f652 Merge branch 'develop' into recovery-firmware ... # Conflicts: # src/CMakeLists.txt # src/displayapp/DisplayApp.h # src/systemtask/SystemTask.cpp # src/systemtask/SystemTask.h		2021-03-07 08:44:14 +01:00
..
ble	Add documentation about BLE connection and services.	2020-04-05 17:03:06 +02:00
bootloader	Add missing pictures.	2020-08-10 17:03:30 +02:00
companionapps	Renamed documentation folder for consistency	2020-10-02 21:40:25 +03:00
gettingStarted	Add new Getting started doc.	2020-11-20 18:36:39 +01:00
ble.md	Add guideline to chose the UUID of custom BLE services in docs.	2021-01-19 21:25:57 +01:00
branches.md	Add doc about branches, versioning and contributions	2020-07-26 16:15:12 +02:00
buildAndProgram.md	Merge branch 'develop' into recovery-firmware	2021-03-07 08:44:14 +01:00
buildWithDocker.md	Integrate improvements from #137	2020-12-21 03:10:42 +00:00
contribute.md	Add coding conventions in contribute.md	2020-10-04 12:52:48 +02:00
filesInReleaseNotes.md	Fix typo	2020-10-06 21:10:51 +02:00
MemoryAnalysis.md	Update MemoryAnalysis.md	2020-10-19 21:26:13 +02:00
NavigationService.md	Merge branch piggz/nav into develop:	2021-01-20 21:34:09 +01:00
openOCD.md	Fix config file discrepancy	2021-01-19 11:07:47 -08:00
PinetimeStubWithNrf52DK.md	Add documentation about building a stub using NRF52-DK.	2020-01-02 15:19:28 +01:00
SPI-LCD-driver.md	Edit README	2020-07-22 15:33:57 -07:00
versioning.md	Add doc about branches, versioning and contributions	2020-07-26 16:15:12 +02:00