diff options
author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2017-08-23 14:32:23 -0500 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-08-23 14:32:23 -0500 |
commit | a52be09f822f00828806ef52b9e5ea69e1e0dae2 (patch) | |
tree | b29ae3e4a5c75bf30b21dddaf8791d5b7f0f083c /config.guess | |
parent | 0f819d5801820f19a8f088528dbf00ad54d58ebb (diff) | |
parent | 3e9cd53b5cfd41cd1d5e14d4e5a690c3633e2bd3 (diff) |
Merge changes from topic 'ASTERISK-27212' into 15
* changes:
bridge_channel.c: Fix FRACK when mapping frames to the bridge.
bridge: Fix softmix bridge deadlock.
Diffstat (limited to 'config.guess')
0 files changed, 0 insertions, 0 deletions