]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge changes from topic 'system_stress_patches' into 13
authorJoshua Colp <jcolp@digium.com>
Tue, 26 Apr 2016 09:56:36 +0000 (04:56 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Tue, 26 Apr 2016 09:56:36 +0000 (04:56 -0500)
* changes:
  Bridge system: Fix memory leaks and double frees on impart failure.
  bridge_softmix.c: Fix crash if channel fails to join mixing tech.

1  2 
main/bridge.c

diff --cc main/bridge.c
Simple merge