]> granicus.if.org Git - esp-idf/commitdiff
projects / esp-idf / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a62cbfe e1ac7ed)
Merge branch 'mesh/cs_root_conflict' into 'master'
authorJiang Jiang Jian <jack@espressif.com>
Wed, 16 Jan 2019 13:16:56 +0000 (21:16 +0800)
committerJiang Jiang Jian <jack@espressif.com>
Wed, 16 Jan 2019 13:16:56 +0000 (21:16 +0800)
detect and fix root conflicts when router BSSID is not set

See merge request idf/esp-idf!3869


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