Tian Hao 4ed6404e9f Merge remote-tracking branch 'remotes/origin/feature/btdm_arch_debug1' into feature/btdm_arch ... # Conflicts: # components/bt/bluedroid/api/include/esp_gatt_defs.h # components/bt/bluedroid/btc/profile/std/gap/btc_gap_ble.c		2016-11-21 14:50:51 +08:00
..
avct_api.h	component/bt : cleanup id/uuid define	2016-11-16 00:34:48 +08:00
avdt_api.h	component/bt : cleanup id/uuid define	2016-11-16 00:34:48 +08:00
avdt_defs.h	component/bt : cleanup id/uuid define	2016-11-16 00:34:48 +08:00
avdtc_api.h	component/bt : cleanup id/uuid define	2016-11-16 00:34:48 +08:00
avrc_api.h	component/bt : cleanup id/uuid define	2016-11-16 00:34:48 +08:00
avrc_defs.h	component/bt : cleanup id/uuid define	2016-11-16 00:34:48 +08:00
bt_sdp.h	component/bt : cleanup id/uuid define	2016-11-16 00:34:48 +08:00
btc_gap_ble.h	component/bt : gatt server	2016-11-18 00:30:35 +08:00
btc_gap_bt.h	component/bt : cleanup id/uuid define	2016-11-16 00:34:48 +08:00
btc_gattc.h	component/bt : mv some define to btc	2016-11-16 02:10:37 +08:00
btc_gatts.h	component/bt : mv some define to btc	2016-11-16 02:10:37 +08:00
dis_api.h	component bt: Added the client demo to the bt project	2016-11-17 06:37:56 -05:00
hid_le_prf.h	component/bt : cleanup id/uuid define	2016-11-16 00:34:48 +08:00
srvc_api.h	component/bt : cleanup id/uuid define	2016-11-16 00:34:48 +08:00