]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "Frame deferral: Re-queue deferred frames one-at-a-time." into 13
authorJoshua Colp <jcolp@digium.com>
Thu, 1 Dec 2016 16:38:34 +0000 (10:38 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 1 Dec 2016 16:38:34 +0000 (10:38 -0600)
1  2 
main/channel.c

diff --cc main/channel.c
Simple merge