Michael Balzer 0137aef471 Merge branch 'release/v3.3' of https://github.com/espressif/esp-idf.git into release/v3.3 ... # Conflicts: # components/bt/include/esp_bt.h		2020-07-15 12:08:17 +02:00
..
btc	Add support of NimBLE host in ESP-BLE-Mesh - v3.3	2020-02-13 12:33:23 +05:30
include	Add support of NimBLE host in ESP-BLE-Mesh - v3.3	2020-02-13 12:33:23 +05:30
osi	Merge branch 'release/v3.3' of https://github.com/espressif/esp-idf.git into release/v3.3	2020-07-15 12:08:17 +02:00