Home
last modified time | relevance | path

Searched hist:"200 e95e4980ceba0f6a82083ed994a002f44dff1" (Results 1 – 3 of 3) sorted by relevance

/btstack/example/
H A Dmesh_node_demo.cdiff 200e95e4980ceba0f6a82083ed994a002f44dff1 Thu Dec 07 18:32:07 CET 2023 Matthias Ringwald <[email protected]> Merge branch 'develop'

# Conflicts:
# README.md
# example/sco_demo_util.c
# src/ble/att_server.c
# src/ble/gatt_client.c
# src/classic/hfp.c
# src/classic/hfp.h
# src/classic/hfp_ag.c
# src/hci.c
# src/hci.h

/btstack/
H A DREADME.mddiff 200e95e4980ceba0f6a82083ed994a002f44dff1 Thu Dec 07 18:32:07 CET 2023 Matthias Ringwald <[email protected]> Merge branch 'develop'

# Conflicts:
# README.md
# example/sco_demo_util.c
# src/ble/att_server.c
# src/ble/gatt_client.c
# src/classic/hfp.c
# src/classic/hfp.h
# src/classic/hfp_ag.c
# src/hci.c
# src/hci.h

H A DCHANGELOG.mddiff 200e95e4980ceba0f6a82083ed994a002f44dff1 Thu Dec 07 18:32:07 CET 2023 Matthias Ringwald <[email protected]> Merge branch 'develop'

# Conflicts:
# README.md
# example/sco_demo_util.c
# src/ble/att_server.c
# src/ble/gatt_client.c
# src/classic/hfp.c
# src/classic/hfp.h
# src/classic/hfp_ag.c
# src/hci.c
# src/hci.h