wangmengyang 49b68c38fa Merge branch 'master' into feature/btdm_avrc ... # Conflicts: # components/bt/bluedroid/hci/packet_fragmenter.c # components/bt/bluedroid/stack/include/gatt_api.h		2017-01-17 10:36:26 +08:00
..
include	Merge branch 'master' into feature/btdm_avrc	2017-01-17 10:36:26 +08:00
esp_blufi_api.c	component/bt : mv demo name	2017-01-12 14:44:26 +08:00
esp_bt_device.c	component/bt: fix typos in "if" condition espressions	2017-01-11 13:36:48 +08:00
esp_bt_main.c	component bt:Added the create attribute table method to the new API	2017-01-11 16:57:19 +08:00
esp_gap_ble_api.c	component bt:Added the create attribute table method to the new API	2017-01-11 16:57:19 +08:00
esp_gattc_api.c	component bt:Added the create attribute table method to the new API	2017-01-11 16:57:19 +08:00
esp_gatts_api.c	component bt:Added the create attribute table method to the new API	2017-01-11 16:57:19 +08:00