alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
66b31b89ac
esp-idf/examples/07_blufi/components
History
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_demos Merge branch 'feature/btdm_gap' into feature/btdm_bluedroid 2016-11-01 14:19:38 +08:00
blufi Merge branch 'feature/btdm_gap' into feature/btdm_bluedroid 2016-11-01 14:19:38 +08:00