]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "Revert "Add API for channel frame deferral."" into 14
authorGeorge Joseph <gjoseph@digium.com>
Thu, 10 Nov 2016 13:40:25 +0000 (07:40 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 10 Nov 2016 13:40:25 +0000 (07:40 -0600)
1  2 
main/channel.c

diff --cc main/channel.c
Simple merge