Merge "bridge_softmix: Add SDP "label" attribute to streams" into 16

author Joshua Colp <jcolp@digium.com>

Thu, 25 Oct 2018 12:45:40 +0000 (07:45 -0500)

committer Gerrit Code Review <gerrit2@gerrit.digium.api>

Thu, 25 Oct 2018 12:45:40 +0000 (07:45 -0500)
author Joshua Colp <jcolp@digium.com>
Thu, 25 Oct 2018 12:45:40 +0000 (07:45 -0500)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 25 Oct 2018 12:45:40 +0000 (07:45 -0500)
diff --cc apps/app_confbridge.c
Simple merge
diff --cc main/bridge.c
Simple merge
author	Joshua Colp <jcolp@digium.com>
	Thu, 25 Oct 2018 12:45:40 +0000 (07:45 -0500)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Thu, 25 Oct 2018 12:45:40 +0000 (07:45 -0500)
		1	2
apps/app_confbridge.c	patch \|	diff1 \|	diff2 \|	blob \| history
main/bridge.c	patch \|	diff1 \|	diff2 \|	blob \| history