]> granicus.if.org Git - esp-idf/commit
Merge branch 'master' into feature/btdm_bluedroid
authorTian Hao <tianhao@espressif.com>
Tue, 29 Nov 2016 10:38:37 +0000 (18:38 +0800)
committerTian Hao <tianhao@espressif.com>
Tue, 29 Nov 2016 10:38:37 +0000 (18:38 +0800)
commit5a9801aca72c2e5eaa701b023cec9597fe43a3b3
treeebe16e44f867d0d210f55df5c10cd4ce495ddfa2
parent5a14e8addf8f1266cc85c4e23734ae499b932a14
parentde5279ce6cc80ab0aaf860b2171b05d168b45fc7
Merge branch 'master' into feature/btdm_bluedroid

# Conflicts:
# components/esp32/cpu_freq.c
# components/esp32/lib
components/bt/bt.c
components/esp32/cpu_start.c
components/esp32/include/soc/soc.h
components/esp32/lib
examples/12_blufi/components/blufi/component.mk
examples/12_blufi/main/component.mk
examples/16_pcnt/Makefile
examples/16_pcnt/main/component.mk
examples/16_pcnt/main/pcnt_test.c