Tian Hao acda125e8b Merge branch 'feature/btdm_prf_task' into feature/btdm_bluedroid ... # Conflicts: # components/bt/bluedroid/profiles/core/bt_prf_sys_main.c # components/bt/bluedroid/profiles/core/bt_prf_task.c # components/bt/bluedroid/profiles/core/include/bt_prf_sys.h # components/bt/bluedroid/profiles/core/include/bt_prf_task.h # components/bt/bluedroid/profiles/esp/include/wx_airsync_prf.h # components/bt/bluedroid/profiles/esp/wechat_AirSync/wx_airsync_prf.c # components/bt/bluedroid/stack/btm/btm_sec.c		2016-11-04 19:32:47 +08:00
..
bluedroid	Merge branch 'feature/btdm_prf_task' into feature/btdm_bluedroid	2016-11-04 19:32:47 +08:00
include	component/bt : modify some files adapt to new master	2016-10-07 10:47:25 +08:00
lib@0f11ccac9a	component/esp32 component/bt : seperate phy init	2016-11-03 16:28:04 +08:00
bt.c	component/bt : cleanup ^M	2016-10-18 21:49:00 +08:00
component.mk	component/esp32 component/bt : seperate phy init	2016-11-03 16:28:04 +08:00
Kconfig	Kconfig: use 4 spaces to instead 1 tab	2016-09-28 13:24:58 +08:00