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	Merge branch 'feature/btdm_gap' into feature/btdm_bluedroid	2016-11-01 14:19:38 +08:00
btu	Merge branch 'feature/btdm_gap' into feature/btdm_bluedroid	2016-11-01 14:19:38 +08:00
gap	component/bt : adjust the bluedroid architecture	2016-09-27 21:38:07 +08:00
gatt	component/bt : adjust the bluedroid architecture	2016-09-27 21:38:07 +08:00
hcic	component/bt : use LOG_XXX instead of print	2016-10-26 15:57:40 +08:00
include	component/bt : adjust the bluedroid architecture	2016-09-27 21:38:07 +08:00
l2cap	component bt: 1.modified the btu buffer size from 15 to 60;	2016-10-15 05:46:10 -04:00
sdp	component/bt: add new demo for Bluetooth SDP client	2016-10-31 12:34:11 +08:00
smp	component bt: 1.modified the btu buffer size from 15 to 60;	2016-10-15 05:46:10 -04:00