]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "res_fax.c: Fix deadlock potential in FAXOPT(faxdetect) framehook." into 13
authorzuul <zuul@gerrit.asterisk.org>
Thu, 21 Jul 2016 23:35:12 +0000 (18:35 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 21 Jul 2016 23:35:12 +0000 (18:35 -0500)
1  2 
res/res_fax.c

diff --cc res/res_fax.c
Simple merge