Merge "BuildSystem: pjsip_evsub_set_uas_timeout was not used." into 13

author Joshua Colp <jcolp@digium.com>

Tue, 21 Nov 2017 15:53:54 +0000 (09:53 -0600)

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

Tue, 21 Nov 2017 15:53:54 +0000 (09:53 -0600)
author Joshua Colp <jcolp@digium.com>
Tue, 21 Nov 2017 15:53:54 +0000 (09:53 -0600)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Tue, 21 Nov 2017 15:53:54 +0000 (09:53 -0600)
diff --cc configure
Simple merge
diff --cc configure.ac
Simple merge
diff --cc third-party/pjproject/configure.m4
Simple merge
author	Joshua Colp <jcolp@digium.com>
	Tue, 21 Nov 2017 15:53:54 +0000 (09:53 -0600)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Tue, 21 Nov 2017 15:53:54 +0000 (09:53 -0600)
		1	2
configure	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
third-party/pjproject/configure.m4	patch \|	diff1 \|	diff2 \|	blob \| history