Tian Hao 66b31b89ac Merge branch 'feature/btdm_gap' into feature/btdm_bluedroid ... # Conflicts: # examples/07_blufi/components/bluedroid_demos/app_project/SampleClientProject.c # examples/07_blufi/components/bluedroid_demos/app_project/SampleServerProject.c # examples/07_blufi/components/bluedroid_demos/include/bt_app_common.h		2016-11-01 14:19:38 +08:00
..
btm_acl.c	component/bt: fix logging format for some source files of BTM module	2016-10-24 16:17:55 +08:00
btm_ble.c	component/bt: add bluedroid 1st version	2016-09-26 21:37:39 +08:00
btm_ble_addr.c	component/bt: add bluedroid 1st version	2016-09-26 21:37:39 +08:00
btm_ble_adv_filter.c	component/bt: add bluedroid 1st version	2016-09-26 21:37:39 +08:00
btm_ble_batchscan.c	component/bt: add bluedroid 1st version	2016-09-26 21:37:39 +08:00
btm_ble_bgconn.c	component/bt: add bluedroid 1st version	2016-09-26 21:37:39 +08:00
btm_ble_cont_energy.c	commponent bt:add the wechat airsync profile to the project	2016-10-11 05:43:36 -04:00
btm_ble_gap.c	component/bt : use LOG_XXX instead of print	2016-10-26 15:57:40 +08:00
btm_ble_multi_adv.c	component/bt: add bluedroid 1st version	2016-09-26 21:37:39 +08:00
btm_ble_privacy.c	component/bt: add bluedroid 1st version	2016-09-26 21:37:39 +08:00
btm_dev.c	component/bt: fix logging format for some source files of BTM module	2016-10-24 16:17:55 +08:00
btm_devctl.c	1. Recover "future_t" model implementation using semaphore to allow for blocking function	2016-10-10 21:34:21 +08:00
btm_inq.c	component/bt: add bluedroid 1st version	2016-09-26 21:37:39 +08:00
btm_main.c	component/bt: add bluedroid 1st version	2016-09-26 21:37:39 +08:00
btm_pm.c	component/bt: add bluedroid 1st version	2016-09-26 21:37:39 +08:00
btm_sco.c	component/bt: add bluedroid 1st version	2016-09-26 21:37:39 +08:00
btm_sec.c	component/bt: fix logging format for some source files of BTM module	2016-10-24 16:17:55 +08:00