diff options
| author | Joshua Colp <jcolp@digium.com> | 2016-07-21 18:26:39 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-07-21 18:26:39 -0500 |
| commit | 0b8448a74be219b98e55b9128c939f8f51859c3b (patch) | |
| tree | 19d1a2b65e7e3c609e88cf432f73e84c82f6e354 /main/logger.c | |
| parent | efebb1b9e0c36690b890a891d2735ee84867a522 (diff) | |
| parent | 676aeede3643dbe9b79fd7117ce7e335f236d151 (diff) | |
Merge changes from topic 'ASTERISK-26214' into 13
* changes:
res_fax: Fix FAXOPT(faxdetect) timeout option.
chan_dahdi: Add faxdetect_timeout option.
Diffstat (limited to 'main/logger.c')
0 files changed, 0 insertions, 0 deletions