]> granicus.if.org Git - esp-idf/commitdiff
projects / esp-idf / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 56bbc17 bd20288)
Merge branch 'feature/btdm_bluedroid' into feature/btdm_a2dp
authorwangmengyang <wangmengyang@espressif.com>
Fri, 2 Dec 2016 14:33:09 +0000 (22:33 +0800)
committerwangmengyang <wangmengyang@espressif.com>
Fri, 2 Dec 2016 14:33:09 +0000 (22:33 +0800)
# Conflicts:
# examples/13_bt_sdp/components/bluedroid_demos/btif/btif_core.c
# examples/13_bt_sdp/components/bluedroid_demos/include/btif_util.h

1  2 
components/bt/bluedroid/osi/include/thread.h patch | diff1 | diff2 | blob | history

Unnamed repository; edit this file 'description' to name the repository.