Zhi Wei Jian 833ecfdec9 Merge branch 'master' into 'bugfix/btdm_modify_code_format_and_comments' ... # Conflicts: # examples/bluetooth/gatt_server_service_table/main/gatts_table_creat_demo.c		2017-12-13 15:42:41 +08:00
..
component.mk	build: Fix comments and avoid build warning	2017-04-27 10:51:45 +08:00
gatts_demo.c	Merge branch 'master' into 'bugfix/btdm_modify_code_format_and_comments'	2017-12-13 15:42:41 +08:00
Kconfig	component/bt : use real adv data to set raw adv data	2017-02-10 16:40:40 +08:00