]> granicus.if.org Git - esp-idf/commitdiff
Merge branch 'feature/wifi_bt_new_coex' into 'master'
authorJiang Jiang Jian <jack@espressif.com>
Mon, 2 Apr 2018 14:20:31 +0000 (22:20 +0800)
committerJiang Jiang Jian <jack@espressif.com>
Mon, 2 Apr 2018 14:20:31 +0000 (22:20 +0800)
Feature/wifi bt new coex

See merge request idf/esp-idf!2087


Trivial merge