Tian Hao cb33e2a5ae Merge branch 'feature/btdm_blufi' into feature/btdm_bluedroid ...

# Conflicts:
#	components/bt/bluedroid/bta/dm/bta_dm_pm.c
#	components/bt/component.mk
#	examples/07_blufi/components/bluedroid_demos/app_core/bt_app_core.c
#	examples/07_blufi/components/bluedroid_demos/app_project/SampleServerProject.c

2016-11-01 14:01:49 +08:00

..

bootloader

component/bt : new coexist lib

2016-10-17 15:47:45 +08:00

bt

Merge branch 'feature/btdm_blufi' into feature/btdm_bluedroid

2016-11-01 14:01:49 +08:00

driver

Convert Windows -> Unix line ends in gpio.c

2016-10-08 14:12:55 +08:00

esp32

component/bt : new coexist lib

2016-10-17 15:47:45 +08:00

esptool_py

commponent bt: update the components/bt/lib & components/esptool_py/esptool

2016-10-15 04:42:33 -04:00

expat

components/expat: just change format of expat.rst

2016-09-28 16:26:35 +08:00

freertos

Merge branch 'bugfix/small_fixes_jd' into 'master'

2016-10-12 21:13:34 +08:00

idf_test

rename components/test to idf_test:

2016-10-12 11:17:56 +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

lwip/esp32: support iperf

2016-10-09 15:45:25 +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