Tian Hao acda125e8b Merge branch 'feature/btdm_prf_task' into feature/btdm_bluedroid ...

# Conflicts:
#	components/bt/bluedroid/profiles/core/bt_prf_sys_main.c
#	components/bt/bluedroid/profiles/core/bt_prf_task.c
#	components/bt/bluedroid/profiles/core/include/bt_prf_sys.h
#	components/bt/bluedroid/profiles/core/include/bt_prf_task.h
#	components/bt/bluedroid/profiles/esp/include/wx_airsync_prf.h
#	components/bt/bluedroid/profiles/esp/wechat_AirSync/wx_airsync_prf.c
#	components/bt/bluedroid/stack/btm/btm_sec.c

2016-11-04 19:32:47 +08:00

..

bootloader

Merge branch 'master' into feature/btdm_bluedroid

2016-11-01 17:53:59 +08:00

bt

Merge branch 'feature/btdm_prf_task' into feature/btdm_bluedroid

2016-11-04 19:32:47 +08:00

driver

Convert Windows -> Unix line ends in gpio.c

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

esp32

component/esp32 component/bt : seperate phy init

2016-11-03 16:28:04 +08:00

esptool_py

bootloader, menuconfig: add flash size setting support

2016-10-21 15:27:25 +11:00

expat

components/expat: just change format of expat.rst

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

freertos

Merge branch 'feature/crosscore_int' into 'master'

2016-10-31 11:04:28 +08:00

idf_test

fix bug for case WIFI_CONN_0102:

2016-10-24 18:59:56 +08:00

json

json & expat: Update component.mk after merging from master

2016-09-09 14:07:45 +10:00

log

build system: add menuconfig choice for optimization level, reorganize C*FLAGS

2016-10-17 12:38:17 +08:00

lwip

turn on per socket tcp window by default

2016-10-31 19:43:18 +08:00

mbedtls

Kconfig: use 4 spaces to instead 1 tab

2016-09-28 13:24:58 +08:00

newlib

vfs: code review fixes

2016-10-27 17:25:38 +08:00

nghttp

Add test for compiling in release mode, fix warnings and errors which appeared

2016-10-17 13:40:10 +08:00

nvs_flash

Merge branch 'bugfix/nvs_leaks' into 'master'

2016-10-31 17:30:00 +08: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

spi_flash: update comment blocks

2016-10-27 17:58:42 +08:00

tcpip_adapter

esp32/tcpip_adapter: softap supports max 10 stations

2016-10-28 16:53:49 +08:00

vfs

vfs: fix adding CR

2016-10-28 16:16:12 +08:00

xtensa-debug-module

Add licenses to Trax files

2016-10-21 18:01:20 +08:00