Merge "BuildSystem: With external editline, do not require libs for internal editline...

author Joshua Colp <jcolp@digium.com>

Mon, 2 Apr 2018 13:42:03 +0000 (08:42 -0500)

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

Mon, 2 Apr 2018 13:42:03 +0000 (08:42 -0500)
author Joshua Colp <jcolp@digium.com>
Mon, 2 Apr 2018 13:42:03 +0000 (08:42 -0500)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 2 Apr 2018 13:42:03 +0000 (08:42 -0500)
diff --cc configure
Simple merge
diff --cc configure.ac
Simple merge
author	Joshua Colp <jcolp@digium.com>
	Mon, 2 Apr 2018 13:42:03 +0000 (08:42 -0500)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Mon, 2 Apr 2018 13:42:03 +0000 (08:42 -0500)
		1	2
configure	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history