]> granicus.if.org Git - esp-idf/commit
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)
commit3026eda86a485068bfdf8003cce15a3c4ab5564a
treeb24bd8a8f143b0abfa3bf8075015cf6f98c4a429
parent9050307dfe600c915adaccf8076220d6474876db
parentf6f094213e337d728a78fd18cd68bbf9dae3d141
Merge branch 'feature/btdm_sec_rebase_api' into 'master'

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