]> git.ipfire.org Git - thirdparty/asterisk.git/commit
projects / thirdparty / asterisk.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0f819d5 3e9cd53)
Merge changes from topic 'ASTERISK-27212' into 15
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Wed, 23 Aug 2017 19:32:23 +0000 (14:32 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 23 Aug 2017 19:32:23 +0000 (14:32 -0500)
commita52be09f822f00828806ef52b9e5ea69e1e0dae2
treeb29ae3e4a5c75bf30b21dddaf8791d5b7f0f083ctree | snapshot
parent0f819d5801820f19a8f088528dbf00ad54d58ebbcommit | diff
parent3e9cd53b5cfd41cd1d5e14d4e5a690c3633e2bd3commit | 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.
bridges/bridge_softmix.c diff1 | diff2 | blob | history
Mirror of https://github.com/asterisk/asterisk.git