esp-idf/components
Tian Hao f87ebb6d49 Merge branch 'feature/btdm_blufi' into feature/btdm_bluedroid
# Conflicts:
#	components/bt/bluedroid/stack/btu/btu_task.c
2016-10-16 17:08:05 +08:00
..
bootloader esp32: Bootloader wake deep sleep stub 2016-09-28 11:14:58 +08:00
bt Merge branch 'feature/btdm_blufi' into feature/btdm_bluedroid 2016-10-16 17:08:05 +08:00
driver Modify spinlock error in periph_ctrl.c 2016-09-29 11:50:25 +08:00
esp32 component/bt: cleanup phy/rtc/pp libs 2016-10-16 16:50:02 +08:00
esptool_py esptool: Bump upstream revision 2016-09-26 17:21:11 +10:00
expat components/expat: just change format of expat.rst 2016-09-28 16:26:35 +08:00
freertos Merge branch 'feature/deep_sleep_wake_stub' into 'master' 2016-09-29 18:07:16 +08:00
json json & expat: Update component.mk after merging from master 2016-09-09 14:07:45 +10:00
log Kconfig: use 4 spaces to instead 1 tab 2016-09-28 13:24:58 +08:00
lwip Kconfig: use 4 spaces to instead 1 tab 2016-09-28 13:24:58 +08:00
mbedtls Kconfig: use 4 spaces to instead 1 tab 2016-09-28 13:24:58 +08:00
newlib Name component makefiles component.mk instead of Makefile 2016-09-08 13:41:19 +10:00
nghttp components/nghttp: just change format of nghttp.rst 2016-09-28 16:26:35 +08:00
nvs_flash nvs: Remove flash layout arguments from nvs_init() 2016-09-27 13:28:45 +10:00
partition_table Remove bin/ directory in favour of an add_path.sh script that can be sourced 2016-09-01 18:45:10 +10:00
spi_flash Kconfig: use 4 spaces to instead 1 tab 2016-09-28 13:24:58 +08:00
tcpip_adapter components/tcpip_adapter: add some comments 2016-09-29 10:55:52 +08:00