wangmengyang 73f00732cf Merge branch 'feature/btdm_bluedroid' into feature/btdm_a2dp ... # Conflicts: # components/bt/bluedroid/bta/sys/bta_sys_main.c # components/bt/bluedroid/btc/profile/std/avrc/avrc_api.c # components/bt/bluedroid/btc/profile/std/avrc/avrc_bld_ct.c # components/bt/bluedroid/btc/profile/std/avrc/avrc_bld_tg.c # components/bt/bluedroid/btc/profile/std/avrc/avrc_opt.c # components/bt/bluedroid/btc/profile/std/avrc/avrc_pars_ct.c # components/bt/bluedroid/btc/profile/std/avrc/avrc_pars_tg.c # components/bt/bluedroid/btc/profile/std/avrc/avrc_sdp.c # components/bt/bluedroid/btc/profile/std/avrc/avrc_utils.c # components/bt/bluedroid/btc/profile/std/avrc/include/avrc_int.h # components/bt/bluedroid/btc/profile/std/include/avct_api.h # components/bt/bluedroid/btc/profile/std/include/avdt_api.h # components/bt/bluedroid/btc/profile/std/include/avdt_defs.h # components/bt/bluedroid/btc/profile/std/include/avdtc_api.h # components/bt/bluedroid/btc/profile/std/include/avrc_api.h # components/bt/bluedroid/btc/profile/std/include/avrc_defs.h # components/bt/bluedroid/gki/gki_buffer.c # components/bt/bluedroid/hci/hci_hal_h4.c # components/bt/bluedroid/hci/hci_layer.c # components/bt/bluedroid/hci/packet_fragmenter.c # components/bt/bluedroid/include/bt_trace.h # components/bt/bluedroid/osi/alarm.c # components/bt/bluedroid/profiles/std/avrc/avrc_api.c # components/bt/bluedroid/profiles/std/avrc/avrc_bld_ct.c # components/bt/bluedroid/profiles/std/avrc/avrc_bld_tg.c # components/bt/bluedroid/profiles/std/avrc/avrc_opt.c # components/bt/bluedroid/profiles/std/avrc/avrc_pars_ct.c # components/bt/bluedroid/profiles/std/avrc/avrc_pars_tg.c # components/bt/bluedroid/profiles/std/avrc/avrc_sdp.c # components/bt/bluedroid/profiles/std/avrc/avrc_utils.c # components/bt/bluedroid/profiles/std/avrc/include/avrc_int.h # components/bt/bluedroid/profiles/std/include/avct_api.h # components/bt/bluedroid/profiles/std/include/avdt_api.h # components/bt/bluedroid/profiles/std/include/avdt_defs.h # components/bt/bluedroid/profiles/std/include/avdtc_api.h # components/bt/bluedroid/profiles/std/include/avrc_api.h # components/bt/bluedroid/profiles/std/include/avrc_defs.h # components/bt/bluedroid/stack/avdt/include/avdt_defs.h # components/bt/bluedroid/stack/avrc/avrc_api.c # components/bt/bluedroid/stack/avrc/avrc_bld_ct.c # components/bt/bluedroid/stack/avrc/avrc_bld_tg.c # components/bt/bluedroid/stack/avrc/avrc_opt.c # components/bt/bluedroid/stack/avrc/avrc_pars_ct.c # components/bt/bluedroid/stack/avrc/avrc_pars_tg.c # components/bt/bluedroid/stack/avrc/avrc_sdp.c # components/bt/bluedroid/stack/avrc/avrc_utils.c # components/bt/bluedroid/stack/avrc/include/avrc_int.h # components/bt/bluedroid/stack/btu/btu_task.c # components/bt/bluedroid/stack/include/avct_api.h # components/bt/bluedroid/stack/include/avdt_api.h # components/bt/bluedroid/stack/include/avdtc_api.h # components/bt/bluedroid/stack/include/avrc_api.h # components/bt/bluedroid/stack/include/avrc_defs.h # components/bt/bluedroid/stack/include/gatt_api.h # components/bt/bluedroid/stack/l2cap/l2c_main.c # components/bt/component.mk # examples/06_bluedroid_demos/components/bluedroid_demos/app_core/bt_app_core.c		2016-11-25 19:45:29 +08:00
..
bootloader	add unit tests to esp-idf	2016-11-22 14:45:50 +08:00
bootloader_support	Build system: Raise warning level	2016-11-16 15:57:34 +11:00
bt	Merge branch 'feature/btdm_bluedroid' into feature/btdm_a2dp	2016-11-25 19:45:29 +08:00
driver	Merge branch 'bugfix/uart_isr_rodata' into 'master'	2016-11-24 12:09:46 +08:00
esp32	component/bt : fix sw coexit call mistake	2016-11-24 20:09:52 +08:00
esp_audio	component/bt: add esp_audio module	2016-11-16 21:58:04 +08:00
esptool_py	Merge branch 'master' into feature/btdm_bluedroid	2016-11-24 15:45:04 +08:00
expat	Build system: Raise warning level	2016-11-16 15:57:34 +11:00
freertos	Fixes for stdlib.h inclusion	2016-11-24 08:20:21 +11:00
idf_test	Set result "Succeed" for passed cases	2016-11-02 20:54:22 +08:00
json	build system: Refactor component.mk to not need component_common.mk	2016-11-10 15:52:22 +11:00
log	Merge branch 'master' into feature/build_component_project_vars	2016-11-14 14:54:41 +11:00
lwip	Merge branch 'bugfix/arp_queue_failed' into 'master'	2016-11-22 14:45:44 +08:00
mbedtls	Fixes for stdlib.h inclusion	2016-11-24 08:20:21 +11:00
micro-ecc	micro-ecc: Add submodule dependency	2016-11-17 09:18:51 +11:00
newlib	add unit tests to esp-idf	2016-11-22 14:45:50 +08:00
nghttp	build system: Refactor component.mk to not need component_common.mk	2016-11-10 15:52:22 +11:00
nvs_flash	add updated nvs flash test	2016-11-23 11:29:36 +08:00
openssl	Merge branch 'master' into feature/openssl	2016-11-15 15:20:48 +08:00
partition_table	add unit tests to esp-idf	2016-11-22 14:45:50 +08:00
spi_flash	add unit tests to esp-idf	2016-11-22 14:45:50 +08:00
tcpip_adapter	ipv6 interface: add branch for ipv6 interface	2016-11-21 11:06:51 +08:00
vfs	docs: fix Doxygen warnings, fail CI build on Doxygen warnings	2016-11-16 22:44:22 +08:00
wpa_supplicant	build system: Refactor component.mk to not need component_common.mk	2016-11-10 15:52:22 +11:00
xtensa-debug-module	build system: Refactor component.mk to not need component_common.mk	2016-11-10 15:52:22 +11:00