]> granicus.if.org Git - esp-idf/commitdiff
projects / esp-idf / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b19b870 38d58f1)
Merge branch 'cherry-pick-7d0d2854' into 'release/v3.0'
authorJiang Jiang Jian <jack@espressif.com>
Thu, 28 Dec 2017 14:07:27 +0000 (22:07 +0800)
committerJiang Jiang Jian <jack@espressif.com>
Thu, 28 Dec 2017 14:07:27 +0000 (22:07 +0800)
Merge branch 'bugfix/btdm_error_when_white_list_is_full' into 'master'

See merge request !1715


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