wangmengyang 11ddfbba4e Merge branch 'feature/btdm_bluedroid' into feature/btdm_a2dp ... # Conflicts: # examples/13_bt_sdp/components/bluedroid_demos/btif/btif_core.c # examples/13_bt_sdp/components/bluedroid_demos/include/btif_util.h		2016-12-02 22:33:09 +08:00
..
include	Merge branch 'feature/btdm_bluedroid' into feature/btdm_a2dp	2016-12-02 22:33:09 +08:00
esp_blufi_api.c	component/bt : run astyle handle the code files	2016-11-25 02:10:15 +08:00
esp_bt_main.c	component/bt : run astyle handle the code files	2016-11-25 02:10:15 +08:00
esp_gap_ble_api.c	component/bt : cleanup status and spell check	2016-11-28 22:40:30 +08:00
esp_gattc_api.c	component/bt : fix compile error	2016-11-29 19:45:10 +08:00
esp_gatts_api.c	component/bt : fix compile error	2016-11-29 19:45:10 +08:00