]> granicus.if.org Git - esp-idf/commit
projects / esp-idf / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit11ddfbba4e372e7821f02fd387123cb9290f5c8e
treed43e62b8214ceb96d221759c8818d5417a4af138tree | snapshot
parent56bbc17ddcff8c4227a4f22ccc10940abfc7bb14commit | diff
parentbd20288b81ec54e861b7fe5f432c1cb19d68075ccommit | diff
Merge branch 'feature/btdm_bluedroid' into feature/btdm_a2dp

# Conflicts:
# examples/13_bt_sdp/components/bluedroid_demos/btif/btif_core.c
# examples/13_bt_sdp/components/bluedroid_demos/include/btif_util.h
components/bt/bluedroid/osi/include/thread.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.