]> granicus.if.org Git - esp-idf/commit
Merge branch 'master' into 'refactor/btdm_spp_client_demo'
authorXie Wen Xiang <xiewenxiang@espressif.com>
Mon, 6 Nov 2017 06:38:01 +0000 (14:38 +0800)
committerXie Wen Xiang <xiewenxiang@espressif.com>
Mon, 6 Nov 2017 06:38:01 +0000 (14:38 +0800)
commit7a423392c376a79edb3bd6be3b87853718694185
tree694c0e051c5de3dd6ddf7712340d4e8c8d5ecfcf
parent04a8d32cba7c23794534c865a591dfd96de55662
parent0ee9d93e5837d1846c6a61ff6c4c3ae2f3f5c704
Merge branch 'master' into 'refactor/btdm_spp_client_demo'

# Conflicts:
#   examples/bluetooth/ble_spp_client/main/spp_client_demo.c
examples/bluetooth/ble_spp_client/main/spp_client_demo.c