Merge "bridge_softmix_binaural: Enable FFTW3 in Solaris 11." into 15

author Kevin Harwell <kharwell@digium.com>

Thu, 5 Jul 2018 21:19:26 +0000 (16:19 -0500)

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

Thu, 5 Jul 2018 21:19:26 +0000 (16:19 -0500)
author Kevin Harwell <kharwell@digium.com>
Thu, 5 Jul 2018 21:19:26 +0000 (16:19 -0500)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 5 Jul 2018 21:19:26 +0000 (16:19 -0500)
diff --cc configure
Simple merge
diff --cc configure.ac
Simple merge
author	Kevin Harwell <kharwell@digium.com>
	Thu, 5 Jul 2018 21:19:26 +0000 (16:19 -0500)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Thu, 5 Jul 2018 21:19:26 +0000 (16:19 -0500)
		1	2
configure	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history