mirror of
https://github.com/pine64/bl_iot_sdk.git
synced 2024-07-05 12:38:59 +00:00
8ac96e8cff
Merge in a number of upstream changes from Bouffalo, resolving conflicts. Most conflicts came from warring whitespace fixes, which is better than no whitespace fixes in either repo. I generally took the upstream version in such cases to make future merges easier. I have left out all upstream docs changes from this merge, since those will have to be separately merged into our bl602-docs submodule. |
||
|---|---|---|
| .. | ||
| 3rdparty/aws-iot | ||
| audio | ||
| bl602 | ||
| fs | ||
| hal_drv | ||
| network | ||
| security/mbedtls | ||
| stage | ||
| sys | ||
| utils | ||