]> granicus.if.org Git - esp-idf/commit
projects / esp-idf / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bde768f 3ecce07)
Merge branch 'feature/btdm_blufi' into feature/btdm_bluedroid
authorTian Hao <tianhao@espressif.com>
Sun, 16 Oct 2016 09:08:05 +0000 (17:08 +0800)
committerTian Hao <tianhao@espressif.com>
Sun, 16 Oct 2016 09:08:05 +0000 (17:08 +0800)
commitf87ebb6d49bc21b0b43af1a3235f1e0240226a68
tree406e6506283feaba5fbf0b45a83c6b3ac21eb460tree | snapshot
parentbde768f13cae5ea34135b2e26c53479659931a46commit | diff
parent3ecce07dbc5f101fee802cecd51517292a6dd779commit | diff
Merge branch 'feature/btdm_blufi' into feature/btdm_bluedroid

# Conflicts:
# components/bt/bluedroid/stack/btu/btu_task.c
components/bt/bluedroid/stack/btu/btu_init.c diff1 | diff2 | blob | history
components/bt/bluedroid/stack/btu/btu_task.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.