]> granicus.if.org Git - esp-idf/commitdiff
projects / esp-idf / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9050307 f6f0942)
Merge branch 'feature/btdm_sec_rebase_api' into 'master'
authorJiang Jiang Jian <jack@espressif.com>
Fri, 14 Apr 2017 04:12:24 +0000 (12:12 +0800)
committerJiang Jiang Jian <jack@espressif.com>
Fri, 14 Apr 2017 04:12:24 +0000 (12:12 +0800)
component/bt:move the btdm_rebase_ssp_api branch to this branch

remove the btdm_rebase_ssp_api branch & move it to this branch avoid the conflict with the maset

See merge request !667


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