Merge "Binaural synthesis (confbridge): Adds binaural synthesis to bridge_softmix."

author Joshua Colp <jcolp@digium.com>

Fri, 24 Feb 2017 18:49:00 +0000 (12:49 -0600)

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

Fri, 24 Feb 2017 18:49:00 +0000 (12:49 -0600)
author Joshua Colp <jcolp@digium.com>
Fri, 24 Feb 2017 18:49:00 +0000 (12:49 -0600)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 24 Feb 2017 18:49:00 +0000 (12:49 -0600)
diff --cc configure
Simple merge
diff --cc configure.ac
Simple merge
author	Joshua Colp <jcolp@digium.com>
	Fri, 24 Feb 2017 18:49:00 +0000 (12:49 -0600)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Fri, 24 Feb 2017 18:49:00 +0000 (12:49 -0600)
		1	2
configure	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history