]> granicus.if.org Git - esp-idf/commit
projects / esp-idf / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4ea3832 b83b0ed)
Merge branch 'feature/btdm_prf_task' into feature/btdm_bluedroid
authorTian Hao <tianhao@espressif.com>
Fri, 4 Nov 2016 11:32:47 +0000 (19:32 +0800)
committerTian Hao <tianhao@espressif.com>
Fri, 4 Nov 2016 11:32:47 +0000 (19:32 +0800)
commitacda125e8bc587d074fc0d6b6973c2e68b5acbfc
tree728467134b9d1861bca99bd532ece40330e25217tree | snapshot
parent4ea38327b6f2c081bbb95df3e6fcbaaa860670aecommit | diff
parentb83b0ed06a9be85161c918249a9ac2c9832d8d78commit | diff
Merge branch 'feature/btdm_prf_task' into feature/btdm_bluedroid

# Conflicts:
# components/bt/bluedroid/profiles/core/bt_prf_sys_main.c
# components/bt/bluedroid/profiles/core/bt_prf_task.c
# components/bt/bluedroid/profiles/core/include/bt_prf_sys.h
# components/bt/bluedroid/profiles/core/include/bt_prf_task.h
# components/bt/bluedroid/profiles/esp/include/wx_airsync_prf.h
# components/bt/bluedroid/profiles/esp/wechat_AirSync/wx_airsync_prf.c
# components/bt/bluedroid/stack/btm/btm_sec.c
19 files changed:
components/bt/bluedroid/profiles/core/bt_prf_sys_main.c diff1 | diff2 | blob | history
components/bt/bluedroid/profiles/core/bt_prf_task.c diff1 | diff2 | blob | history
components/bt/bluedroid/profiles/core/include/bt_prf_sys.h diff1 | diff2 | blob | history
components/bt/bluedroid/profiles/core/include/bt_prf_task.h diff1 | diff2 | blob | history
components/bt/bluedroid/profiles/esp/ble_button/button_pro.c diff1 | diff2 | blob | history
components/bt/bluedroid/profiles/esp/blufi/include/blufi_adv.h diff1 | | blob | history
components/bt/bluedroid/profiles/esp/include/wx_airsync_prf.h diff1 | diff2 | blob | history
components/bt/bluedroid/profiles/esp/wechat_AirSync/wx_airsync_prf.c diff1 | diff2 | blob | history
components/bt/bluedroid/stack/btm/btm_ble_gap.c diff1 | diff2 | blob | history
components/bt/bluedroid/stack/btm/btm_sec.c diff1 | diff2 | blob | history
components/bt/bluedroid/stack/btu/btu_hcif.c diff1 | diff2 | blob | history
components/bt/bluedroid/stack_api/bt_app_api.c | diff2 | blob | history
components/bt/bluedroid/stack_api/bt_app_sec.c diff1 | diff2 | blob | history
components/bt/bluedroid/stack_api/include/bt_app_api.h | diff2 | blob | history
components/bt/bluedroid/stack_api/include/bt_app_common.h diff1 | diff2 | blob | history
components/bt/bluedroid/stack_api/include/bt_app_defs.h | diff2 | blob | history
components/bt/bluedroid/stack_api/include/bt_app_sec.h diff1 | diff2 | blob | history
examples/06_bluedroid_demos/components/bluedroid_demos/app_core/bt_app_core.c diff1 | diff2 | blob | history
examples/06_bluedroid_demos/components/bluedroid_demos/app_project/SampleServerProject.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.