]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "bridge_softmix.c: Don't match dead streams." into 15
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Tue, 19 Dec 2017 17:19:42 +0000 (11:19 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Tue, 19 Dec 2017 17:19:42 +0000 (11:19 -0600)
1  2 
bridges/bridge_softmix.c

Simple merge