]> granicus.if.org Git - esp-idf/commit
projects / esp-idf / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bf20b95 1561c02)
Merge remote-tracking branch 'remotes/origin/feature/btdm_arch_debug1' into feature...
authorTian Hao <tianhao@espressif.com>
Mon, 21 Nov 2016 06:50:51 +0000 (14:50 +0800)
committerTian Hao <tianhao@espressif.com>
Mon, 21 Nov 2016 06:50:51 +0000 (14:50 +0800)
commit4ed6404e9f8a76a78dbda7cad5830335b14166d6
treeaa38762e11cd31158b839f7c1d499d6532a321d6tree | snapshot
parentbf20b958a973eb8f16074cde071712cb58d6c6f5commit | diff
parent1561c02ba9723a028b5e353b3a5625b7448d3f5dcommit | diff
Merge remote-tracking branch 'remotes/origin/feature/btdm_arch_debug1' into feature/btdm_arch

# Conflicts:
# components/bt/bluedroid/api/include/esp_gatt_defs.h
# components/bt/bluedroid/btc/profile/std/gap/btc_gap_ble.c
13 files changed:
components/bt/bluedroid/api/esp_gap_ble_api.c diff1 | diff2 | blob | history
components/bt/bluedroid/api/include/esp_gap_ble_api.h diff1 | diff2 | blob | history
components/bt/bluedroid/api/include/esp_gatt_defs.h diff1 | diff2 | blob | history
components/bt/bluedroid/btc/core/btc_task.c diff1 | diff2 | blob | history
components/bt/bluedroid/btc/profile/std/gap/btc_gap_ble.c diff1 | diff2 | blob | history
examples/10_gatt_client/Makefile | | blob
examples/10_gatt_client/README.rst | diff2 | blob | history
examples/10_gatt_client/components/bluedroid_demos/app_core/bt_app_core.c | diff2 | blob | history
examples/10_gatt_client/components/bluedroid_demos/app_project/Arch_SimpleClientProject.c | diff2 | blob | history
examples/10_gatt_client/components/bluedroid_demos/component.mk | diff2 | blob | history
examples/10_gatt_client/components/bluedroid_demos/include/bt_app_common.h | diff2 | blob | history
examples/10_gatt_client/main/component.mk | | blob
examples/10_gatt_client/main/demo_main.c | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.