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
..
2016-09-29 16:11:58 +02:00
2016-10-25 11:47:20 +02:00
2016-11-14 15:54:38 +01:00
2016-09-29 16:11:58 +02:00
2016-04-20 23:27:58 +02:00
2016-09-29 16:06:01 +02:00
2016-11-10 21:54:50 +01:00
2016-01-22 17:52:43 +01:00