granicus.if.org Git - esp-idf/commit

]> granicus.if.org Git - esp-idf/commit

projects / esp-idf / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: dbee895 cd3d971)

author	Jiang Jiang Jian <jack@espressif.com>
	Thu, 12 Oct 2017 11:01:01 +0000 (19:01 +0800)
committer	Jiang Jiang Jian <jack@espressif.com>
	Thu, 12 Oct 2017 11:01:01 +0000 (19:01 +0800)
commit	244e947beb59a16d7b89494c6c7ffe15ce678778
tree	1b494b83e22620293c15aad6bd4b8384ad866537	tree \| snapshot
parent	dbee895741c4722b3a8d2c23e80e5bc66deb8b66	commit \| diff
parent	cd3d9715bbedb6c8538d1d99715b048e0a940da6	commit \| diff

Merge branch 'bugfix/btdm_fix_add_whitelist_failed' into 'master'

Component/bt: fix add whitelist failed

See merge request !1326

components/bt/bluedroid/api/include/esp_gap_ble_api.h	diff1 \|	diff2 \|	blob \| history
components/bt/bluedroid/bta/dm/bta_dm_act.c	diff1 \|	diff2 \|	blob \| history
components/bt/bluedroid/bta/dm/bta_dm_api.c	diff1 \|	diff2 \|	blob \| history
components/bt/bluedroid/bta/dm/bta_dm_int.h	diff1 \|	diff2 \|	blob \| history
components/bt/bluedroid/bta/include/bta_api.h	diff1 \|	diff2 \|	blob \| history
components/bt/bluedroid/btc/profile/std/gap/btc_gap_ble.c	diff1 \|	diff2 \|	blob \| history
components/bt/bluedroid/stack/btm/btm_ble_gap.c	diff1 \|	diff2 \|	blob \| history
components/bt/bluedroid/stack/include/btm_api.h	diff1 \|	diff2 \|	blob \| history
components/bt/bluedroid/stack/include/btm_ble_api.h	diff1 \|	diff2 \|	blob \| history
components/bt/bluedroid/stack/include/btm_ble_int.h	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.