From: zuul <zuul@gerrit.asterisk.org>
Date: Thu, 5 May 2016 14:18:34 +0000 (-0500)
Subject: Merge "res_fax: add FAXMODE variable" into 13
X-Git-Tag: 13.10.0-rc1~103
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=168a7b3dd8c0efd04516f60fd431fce7eac4c985;p=thirdparty%2Fasterisk.git

Merge "res_fax: add FAXMODE variable" into 13
---

168a7b3dd8c0efd04516f60fd431fce7eac4c985
diff --cc CHANGES
index ca216ec4f4,fb8e681e24..63b814c21c
--- a/CHANGES
+++ b/CHANGES
@@@ -12,10 -12,13 +12,15 @@@
  --- Functionality changes from Asterisk 13.9.0 to Asterisk 13.10.0 -----------
  ------------------------------------------------------------------------------
  
+ res_fax
+ ------------------
+  * Added FAXMODE variable to let dialplan know what fax transport was used.
+    FAXMODE variable is set to either "audio" or "T38".
+ 
  res_pjsip
  ------------------
 + * Added new status Updated to AMI event ContactStatus on update registration
 +
   * Added "reg_server" to contacts.
     If the Asterisk system name is set in asterisk.conf, it will be stored
     into the "reg_server" field in the ps_contacts table to facilitate