Jiang Jiang Jian 892fc4ac3f Merge branch 'feature/btdm_add_set_default_passkey_function' into 'master' ...

Component/bt: add set/clear static passkey function

See merge request idf/esp-idf!3128

2018-09-10 16:08:05 +08:00

..

app_trace

Merge branch 'master' into feature/cmake

2018-08-30 18:51:01 +08:00

app_update

Merge branch 'master' into feature/cmake

2018-09-05 10:35:04 +08:00

asio

Merge branch 'master' into feature/cmake

2018-08-16 17:14:17 +10:00

aws_iot

Merge branch 'master' into feature/cmake

2018-08-16 17:14:17 +10:00

bootloader

Merge branch 'master' into feature/cmake

2018-09-05 10:35:04 +08:00

bootloader_support

Merge branch 'master' into feature/cmake

2018-09-05 10:35:04 +08:00

bt

Merge branch 'feature/btdm_add_set_default_passkey_function' into 'master'

2018-09-10 16:08:05 +08:00

coap

Merge branch 'master' into feature/cmake

2018-08-16 17:14:17 +10:00

console

Merge branch 'master' into feature/cmake

2018-08-16 17:14:17 +10:00

cxx

Merge branch 'master' into feature/cmake

2018-08-16 17:14:17 +10:00

driver

sdio_slave: fix the recv crash when trans finish and load at the same time

2018-09-10 13:06:54 +08:00

esp32

Merge branch 'bugfix/slow_mem_keep_rtc_noinit' into 'master'

2018-09-07 15:54:52 +08:00

esp_adc_cal

cmake: Add component dependency support

2018-04-30 09:59:20 +10:00

esp_http_client

Merge branch 'feature/http_client_custom_method' into 'master'

2018-09-10 14:44:27 +08:00

esp_https_ota

Merge branch 'master' into feature/cmake

2018-08-16 17:14:17 +10:00

esp-tls

Merge branch 'master' into feature/cmake

2018-08-30 18:51:01 +08:00

espcoredump

coredump: Adds support for ROM ELF file to 'espcoredump' script

2018-07-05 22:20:20 +03:00

esptool_py

cmake: Post-merge fixups

2018-09-06 11:14:30 +08:00

ethernet

Merge branch 'feature/cmake' into 'master'

2018-09-07 13:44:17 +08:00

expat

Merge branch 'master' into feature/cmake

2018-08-16 17:14:17 +10:00

fatfs

Merge branch 'master' into feature/cmake

2018-09-05 10:35:04 +08:00

freertos

Merge branch 'master' into feature/cmake

2018-09-05 10:35:04 +08:00

heap

Merge branch 'master' into feature/cmake

2018-09-05 10:35:04 +08:00

http_server

Merge branch 'bugfix/http_server_strcasecmp' into 'master'

2018-09-07 16:45:52 +08:00

idf_test

Merge branch 'master' into feature/cmake

2018-09-06 20:23:04 +08:00

jsmn

cmake: Add component dependency support

2018-04-30 09:59:20 +10:00

json

Merge branch 'master' into feature/cmake_update

2018-05-31 14:46:23 +10:00

libsodium

Merge branch 'master' into feature/cmake

2018-09-05 10:35:04 +08:00

log

Merge branch 'master' into feature/cmake

2018-08-16 17:14:17 +10:00

lwip

lwip: Re-add CONFIG_PPP_SUPPORT check, remove redundant CFLAGS

2018-09-06 20:23:20 +08:00

mbedtls

Merge branch 'master' into feature/cmake

2018-09-05 10:35:04 +08:00

mdns

Merge branch 'master' into feature/cmake

2018-09-06 20:23:04 +08:00

micro-ecc

Merge branch 'master' into feature/cmake

2018-08-16 17:14:17 +10:00

newlib

Merge branch 'master' into feature/cmake

2018-09-05 10:35:04 +08:00

nghttp

Merge branch 'master' into feature/cmake

2018-08-16 17:14:17 +10:00

nvs_flash

Merge branch 'master' into feature/cmake

2018-09-06 20:23:04 +08:00

openssl

Merge branch 'master' into feature/cmake

2018-08-16 17:14:17 +10:00

partition_table

Merge branch 'master' into feature/cmake

2018-09-05 10:35:04 +08:00

pthread

Merge branch 'master' into feature/cmake

2018-08-16 17:14:17 +10:00

sdmmc

Merge branch 'master' into feature/cmake

2018-08-30 18:52:31 +08:00

smartconfig_ack

Merge branch 'master' into feature/cmake

2018-08-16 17:14:17 +10:00

soc

Merge branch 'master' into feature/cmake

2018-09-06 20:23:04 +08:00

spi_flash

Merge branch 'master' into feature/cmake

2018-09-05 10:35:04 +08:00

spiffs

Merge branch 'master' into feature/cmake

2018-08-30 18:51:01 +08:00

tcpip_adapter

Merge branch 'master' into feature/cmake

2018-09-06 20:23:04 +08:00

ulp

Merge branch 'master' into feature/cmake

2018-08-16 17:14:17 +10:00

vfs

Merge branch 'master' into feature/cmake

2018-09-05 10:35:04 +08:00

wear_levelling

Merge branch 'master' into feature/cmake

2018-08-16 17:14:17 +10:00

wpa_supplicant

Merge branch 'master' into feature/cmake

2018-09-05 10:35:04 +08:00

xtensa-debug-module

Merge branch 'master' into feature/cmake_update

2018-05-31 14:46:23 +10:00