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-11-14 15:54:38 +01:00
btstack_ring_buffer_test.c	test/ringbuffer: fix test	2016-10-20 15:27:48 +02:00
Makefile