Milanka Ringwald 25234a7e05 Merge branch 'develop' into a2dp ... Conflicts: example/Makefile.inc example/sco_demo_util.c port/pic32-harmony/app.X/nbproject/Makefile-default.mk port/pic32-harmony/app.X/nbproject/Makefile-genesis.properties port/pic32-harmony/app.X/nbproject/configurations.xml port/pic32-harmony/create_examples.py src/classic/btstack_cvsd_plc.c src/classic/btstack_sbc_bludroid.c src/classic/btstack_sbc_plc.c test/ring_buffer/.gitignore		2016-11-14 15:54:38 +01:00
..
.gitignore	Merge branch 'develop' into a2dp	2016-08-24 13:45:38 +02:00
btstack_config.h	example: add characteristic that requires authentication, requrest le secure connecions	2016-05-27 16:40:53 +02:00
main.c	hci: disable parts of classic code if ENABLE_CLASSIC is not defined	2016-10-19 16:06:11 +02:00
Makefile	Merge branch 'develop' into a2dp	2016-11-14 15:54:38 +01:00