]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
projects / thirdparty / asterisk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: efebb1b 676aeed)
Merge changes from topic 'ASTERISK-26214' into 13
authorJoshua Colp <jcolp@digium.com>
Thu, 21 Jul 2016 23:26:39 +0000 (18:26 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 21 Jul 2016 23:26:39 +0000 (18:26 -0500)
* changes:
  res_fax: Fix FAXOPT(faxdetect) timeout option.
  chan_dahdi: Add faxdetect_timeout option.


Trivial merge
Mirror of https://github.com/asterisk/asterisk.git