Commit Graph

3 Commits

Author SHA1 Message Date
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
Milanka Ringwald
fcb08cdb2a sbc decoder: integration with sco_util 2016-07-08 17:11:57 +02:00
Matthias Ringwald
f7c85330b9 example/hsp+hfp: extract SCO test code into sco_demo_util 2016-05-23 18:04:57 +02:00