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

..

bluedroid

Merge branch 'feature/btdm_gap' into feature/btdm_bluedroid

2016-11-01 14:19:38 +08:00

include

component/bt : modify some files adapt to new master

2016-10-07 10:47:25 +08:00

lib @ 0c3df46cb3

component/bt : new coexist lib

2016-10-17 15:47:45 +08:00

bt.c

component/bt : cleanup ^M

2016-10-18 21:49:00 +08:00

component.mk

Merge branch 'feature/btdm_gap' into feature/btdm_bluedroid

2016-11-01 14:19:38 +08:00

Kconfig

Kconfig: use 4 spaces to instead 1 tab

2016-09-28 13:24:58 +08:00