From: Wu Jian Gang <wujiangang@espressif.com>
Date: Tue, 8 Nov 2016 09:18:57 +0000 (+0800)
Subject: Merge branch 'feature/tw8387_merge_bt_wifi_coexist_code' into 'master'
X-Git-Tag: v1.0~75
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0aca2506fc18bfb0ec09b6f552f955cc9a7343c5;p=esp-idf

Merge branch 'feature/tw8387_merge_bt_wifi_coexist_code' into 'master'

esp32: merge bt/wifi coexist code

1. Modify makefile to add coexist lib
2. Update bt/wifi coexist lib

See merge request !185
---

0aca2506fc18bfb0ec09b6f552f955cc9a7343c5