Jiang Jiang Jian 35785d08fd Merge branch 'feature/btdm_legacy_paring_v3.1' into 'release/v3.1' ...

component/bt: Add Legacy Pairing (backport 3.1)

See merge request idf/esp-idf!3193

2018-09-07 14:44:19 +08:00

..

app_trace

Merge branch 'release/v3.1' into feature/cmake_v3.1

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

app_update

Merge branch 'release/v3.1' into feature/cmake_v3.1

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

aws_iot

Merge branch 'master' into feature/cmake_update

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

bootloader

Merge branch 'release/v3.1' into feature/cmake_v3.1

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

bootloader_support

Merge branch 'release/v3.1' into feature/cmake_v3.1

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

bt

Merge branch 'feature/btdm_legacy_paring_v3.1' into 'release/v3.1'

2018-09-07 14:44:19 +08:00

coap

Merge branch 'release/v3.1' into feature/cmake_v3.1

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

console

Merge branch 'release/v3.1' into feature/cmake_v3.1

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

cxx

Merge branch 'release/v3.1' into feature/cmake_v3.1

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

driver

Merge branch 'feature/cmake_v3.1' into release/v3.1

2018-08-29 19:30:06 +08:00

esp32

defination: fix the bug that esp_derive_local_mac() defination missing

2018-09-05 14:42:23 +08:00

esp_adc_cal

cmake: Add component dependency support

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

esp_http_client

Merge branch 'release/v3.1' into feature/cmake_v3.1

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

esp_https_ota

Merge branch 'release/v3.1' into feature/cmake_v3.1

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

esp-tls

cmake: Add component dependency support

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

espcoredump

bugfix: fixed path to esptool when there is no compiled python module for it

2017-03-21 13:30:38 +03:00

esptool_py

Merge branch 'release/v3.1' into feature/cmake_v3.1

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

ethernet

Merge branch 'release/v3.1' into feature/cmake_v3.1

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

expat

Merge branch 'release/v3.1' into feature/cmake_v3.1

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

fatfs

Merge branch 'release/v3.1' into feature/cmake_v3.1

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

freertos

Merge branch 'release/v3.1' into feature/cmake_v3.1

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

heap

Merge branch 'release/v3.1' into feature/cmake_v3.1

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

idf_test

test: split CI test environment:

2018-09-06 16:35:34 +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 'release/v3.1' into feature/cmake_v3.1

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

log

Merge branch 'release/v3.1' into feature/cmake_v3.1

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

lwip

Merge branch 'feature/cmake_v3.1' into release/v3.1

2018-08-29 19:30:06 +08:00

mbedtls

Merge branch 'release/v3.1' into feature/cmake_v3.1

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

mdns

Merge branch 'release/v3.1' into feature/cmake_v3.1

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

micro-ecc

Merge branch 'release/v3.1' into feature/cmake_v3.1

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

newlib

Merge branch 'release/v3.1' into feature/cmake_v3.1

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

nghttp

Merge branch 'release/v3.1' into feature/cmake_v3.1

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

nvs_flash

Merge branch 'release/v3.1' into feature/cmake_v3.1

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

openssl

Merge branch 'master' into feature/cmake_update

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

partition_table

cmake: partition_table: Use PYTHON interpreter when running parttool.py (fixes flasher args on Windows)

2018-08-27 18:02:30 +08:00

pthread

cmake: Compatibility fixes from Mahavir

2018-06-06 16:14:03 +10:00

sdmmc

Merge branch 'master' into feature/cmake_update

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

smartconfig_ack

Merge branch 'master' into feature/cmake_update

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

soc

Merge branch 'release/v3.1' into feature/cmake_v3.1

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

spi_flash

Merge branch 'release/v3.1' into feature/cmake_v3.1

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

spiffs

Merge branch 'release/v3.1' into feature/cmake_v3.1

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

tcpip_adapter

Merge branch 'master' into feature/cmake_update

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

ulp

Merge branch 'release/v3.1' into feature/cmake_v3.1

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

vfs

Merge branch 'release/v3.1' into feature/cmake_v3.1

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

wear_levelling

Merge branch 'release/v3.1' into feature/cmake_v3.1

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

wpa_supplicant

Merge branch 'release/v3.1' into feature/cmake_v3.1

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

xtensa-debug-module

Merge branch 'master' into feature/cmake_update

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