]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "res_stasis: Add control ref to playback and recording structs."
authorzuul <zuul@gerrit.asterisk.org>
Thu, 31 Mar 2016 18:20:55 +0000 (13:20 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 31 Mar 2016 18:20:55 +0000 (13:20 -0500)
1  2 
res/ari/resource_bridges.c
res/res_stasis.c
res/res_stasis_recording.c

Simple merge
Simple merge
Simple merge