]> granicus.if.org Git - esp-idf/commit
projects / esp-idf / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c124851 d2bd9cc)
Merge branch 'master' into 'bugfix/btdm_modify_code_format_and_comments'
authorZhi Wei Jian <zhiweijian@espressif.com>
Wed, 13 Dec 2017 07:42:41 +0000 (15:42 +0800)
committerZhi Wei Jian <zhiweijian@espressif.com>
Wed, 13 Dec 2017 07:42:41 +0000 (15:42 +0800)
commit833ecfdec9b5ad164d7433629f69cd73258e093e
treef4b776fc1eef391362dbddd89fcdfda8fdd514b8tree | snapshot
parentc12485104888c9ee1668e9c9a9d32f5935c76211commit | diff
parentd2bd9cccd825a8f1ed8c5d9cdae817c3a9bf2a0dcommit | diff
Merge branch 'master' into 'bugfix/btdm_modify_code_format_and_comments'

# Conflicts:
#   examples/bluetooth/gatt_server_service_table/main/gatts_table_creat_demo.c
examples/bluetooth/gatt_server/main/gatts_demo.c diff1 | diff2 | blob | history
examples/bluetooth/gatt_server_service_table/main/gatts_table_creat_demo.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.