Merge "channel.c: Allow generic plc then channel formats are equal" into 13

author Jenkins2 <jenkins2@gerrit.asterisk.org>

Tue, 20 Mar 2018 16:03:38 +0000 (11:03 -0500)

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

Tue, 20 Mar 2018 16:03:38 +0000 (11:03 -0500)
author Jenkins2 <jenkins2@gerrit.asterisk.org>
Tue, 20 Mar 2018 16:03:38 +0000 (11:03 -0500)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Tue, 20 Mar 2018 16:03:38 +0000 (11:03 -0500)
diff --cc main/asterisk.c
Simple merge
diff --cc main/channel.c
Simple merge
author	Jenkins2 <jenkins2@gerrit.asterisk.org>
	Tue, 20 Mar 2018 16:03:38 +0000 (11:03 -0500)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Tue, 20 Mar 2018 16:03:38 +0000 (11:03 -0500)
		1	2
main/asterisk.c	patch \|	diff1 \|	diff2 \|	blob \| history
main/channel.c	patch \|	diff1 \|	diff2 \|	blob \| history