From: George Joseph <gjoseph@digium.com>
Date: Wed, 12 Jun 2019 15:44:36 +0000 (-0500)
Subject: Merge "app_attended_transfer: new application AttendedTransfer" into 13
X-Git-Tag: 13.28.0-rc1~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83c353c65076dded8dedde42b52d75e045562606;p=thirdparty%2Fasterisk.git

Merge "app_attended_transfer: new application AttendedTransfer" into 13
---

83c353c65076dded8dedde42b52d75e045562606
diff --cc menuselect/example_menuselect-tree
index be07fda30f,e944d67da1..83441b1ce9
--- a/menuselect/example_menuselect-tree
+++ b/menuselect/example_menuselect-tree
@@@ -8,10 -8,10 +8,12 @@@
  		</member>
  		<member name="app_amd" displayname="Answering Machine Detection Application" remove_on_change="apps/app_amd.o apps/app_amd.so">
  		</member>
+ 		<member name="app_attended_transfer" displayname="Attended transfer to the given extension" remove_on_change="apps/app_attended_transfer.o apps/app_attended_transfer.so">
+ 		</member>
  		<member name="app_authenticate" displayname="Authentication Application" remove_on_change="apps/app_authenticate.o apps/app_authenticate.so">
  		</member>
 +		<member name="app_blind_transfer" displayname="Blind transfer by caller channel" remove_on_change="apps/app_blind_transfer.o apps/app_blind_transfer.so">
 +		</member>
  		<member name="app_cdr" displayname="Tell Asterisk to not maintain a CDR for the current call" remove_on_change="apps/app_cdr.o apps/app_cdr.so">
  		</member>
  		<member name="app_chanisavail" displayname="Check channel availability" remove_on_change="apps/app_chanisavail.o apps/app_chanisavail.so">
diff --cc menuselect/test/menuselect-tree
index 97cc64f5c3,452a4312b0..5257edcfbe
--- a/menuselect/test/menuselect-tree
+++ b/menuselect/test/menuselect-tree
@@@ -9,10 -9,10 +9,12 @@@
  </member>
  <member name="app_amd" displayname="Answering Machine Detection Application" remove_on_change="apps/app_amd.o apps/app_amd.so">
  </member>
+ <member name="app_attended_transfer" displayname="Attended transfer to the given extension" remove_on_change="apps/app_attended_transfer.o apps/app_attended_transfer.so">
+ </member>
  <member name="app_authenticate" displayname="Authentication Application" remove_on_change="apps/app_authenticate.o apps/app_authenticate.so">
  </member>
 +<member name="app_blind_transfer" displayname="Blind transfer by caller channel" remove_on_change="apps/app_blind_transfer.o apps/app_blind_transfer.so">
 +</member>
  <member name="app_cdr" displayname="Tell Asterisk to not maintain a CDR for the current call" remove_on_change="apps/app_cdr.o apps/app_cdr.so">
  </member>
  <member name="app_chanisavail" displayname="Check channel availability" remove_on_change="apps/app_chanisavail.o apps/app_chanisavail.so">