]> granicus.if.org Git - esp-idf/commit
Merge branch 'master' into feature/btdm_avrc
authorwangmengyang <wangmengyang@espressif.com>
Thu, 23 Feb 2017 07:10:25 +0000 (15:10 +0800)
committerwangmengyang <wangmengyang@espressif.com>
Thu, 23 Feb 2017 07:10:25 +0000 (15:10 +0800)
commit41070f676880bb39bc0ab5755efe9af4b14499e6
tree50e9fb8d27843e2d36897803138ebe0a5ec5b9a2
parent118131109ebe47813f5f8d2faf4a09116e0fc2ad
parent7dfb1c2e971b01f7c8e01307b6bed0a27e5bbdc7
Merge branch 'master' into feature/btdm_avrc

1. merge master into feature/btdm_avrc
2. add call of esp_bt_controller_enable() in app_main
components/bt/bluedroid/bta/include/bta_api.h
examples/09_a2dp/main/demo_main.c