Michael Balzer 9cad14b151 Merge branch 'master' of https://github.com/openvehicles/esp-idf		2018-05-22 22:18:04 +02:00
..
api	Merge branch 'feature/btdm_get_end_handle_when_get_include_service' into 'master'	2018-05-04 19:31:43 +08:00
bta	Merge branch 'bugfix/gap_appearance_fixes' into 'master'	2018-05-01 23:00:24 +08:00
btc	Merge branch 'feature/btdm_get_end_handle_when_get_include_service' into 'master'	2018-05-04 19:31:43 +08:00
common/include/common	component/bt : modify header files to avoid conflict	2018-04-26 19:32:06 +08:00
device	component/bt : modify header files to avoid conflict	2018-04-26 19:32:06 +08:00
external/sbc	component/bt : modify header files to avoid conflict	2018-04-26 19:32:06 +08:00
hci	component/bt : modify header files to avoid conflict	2018-04-26 19:32:06 +08:00
main	component/bt : modify header files to avoid conflict	2018-04-26 19:32:06 +08:00
osi	Merge branch 'master' of https://github.com/openvehicles/esp-idf	2018-05-22 22:18:04 +02:00
stack	Merge branch 'bugfix/btdm_fix_version_excahnge_issue' into 'master'	2018-05-04 19:30:03 +08:00