Merge "Binaural synthesis (confbridge): Adds utils/conf_bridge_binaural_hrir_importer"

author Joshua Colp <jcolp@digium.com>

Mon, 20 Feb 2017 16:24:55 +0000 (10:24 -0600)

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

Mon, 20 Feb 2017 16:24:55 +0000 (10:24 -0600)
author Joshua Colp <jcolp@digium.com>
Mon, 20 Feb 2017 16:24:55 +0000 (10:24 -0600)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 20 Feb 2017 16:24:55 +0000 (10:24 -0600)
diff --cc configure
Simple merge
diff --cc configure.ac
Simple merge
diff --cc include/asterisk/autoconfig.h.in
Simple merge
author	Joshua Colp <jcolp@digium.com>
	Mon, 20 Feb 2017 16:24:55 +0000 (10:24 -0600)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Mon, 20 Feb 2017 16:24:55 +0000 (10:24 -0600)
		1	2
configure	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
include/asterisk/autoconfig.h.in	patch \|	diff1 \|	diff2 \|	blob \| history