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
..
bluedroid	Merge branch 'bugfix/fix_event_bug_in_GAP_API_release_v3.3' into 'release/v3.3'	2020-06-23 12:19:04 +08:00
common	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
esp_ble_mesh	Merge branch 'bugfix/ble_mesh_remove_relay_dependency_v3.3' into 'release/v3.3'	2020-06-03 15:20:56 +08:00
include	fix initializer order for BT_CONTROLLER_INIT_CONFIG_DEFAULT	2020-02-07 18:59:03 +08:00
lib@63e7a37c6c	Backport MR from baid proj	2020-06-10 03:53:21 +00:00
test	bt: Fix unit tests build with CMake	2018-11-28 15:19:04 +08:00
bt.c	Initialize mem_start and mem_end	2020-06-02 08:30:02 +00:00
CMakeLists.txt	ble_mesh: Local model (un)subscribes group address	2020-06-01 09:13:57 +08:00
component.mk	Add support of NimBLE host in ESP-BLE-Mesh - v3.3	2020-02-13 12:33:23 +05:30
Kconfig	Merge branch 'bugfix/ble_mesh_node_old_version_to_new_v3.3' into 'release/v3.3'	2020-05-21 15:10:29 +08:00