]> granicus.if.org Git - esp-idf/commitdiff
Merge branch 'master' into feature/btdm_bluedroid
authorTian Hao <tianhao@espressif.com>
Thu, 24 Nov 2016 07:45:04 +0000 (15:45 +0800)
committerTian Hao <tianhao@espressif.com>
Thu, 24 Nov 2016 07:45:04 +0000 (15:45 +0800)
1. update bt lib submodule

# Conflicts:
# components/bootloader/src/main/esp32.bootloader.ld
# components/bt/component.mk
# components/esp32/component.mk
# components/esp32/lib

1  2 
components/bt/component.mk
components/bt/include/bt.h
components/bt/lib
components/esp32/Kconfig
components/esp32/include/soc/soc.h
examples/05_ble_adv/main/app_bt.c

Simple merge
Simple merge
index 0f11ccac9a5f39e28e5d8904634c54acd4f140fd,bcbc35215c6d87279da4b87a74d3360c537d6724..5349ca363427758b9ef902f33e9ac0dae2c349e1
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 0f11ccac9a5f39e28e5d8904634c54acd4f140fd
 -Subproject commit bcbc35215c6d87279da4b87a74d3360c537d6724
++Subproject commit 5349ca363427758b9ef902f33e9ac0dae2c349e1
Simple merge
Simple merge
Simple merge