diff options
author | Joshua Colp <jcolp@digium.com> | 2016-01-11 17:37:18 -0600 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-01-11 17:37:19 -0600 |
commit | fb8bdcce01d63a2542292e7c050b75d2e8e70b96 (patch) | |
tree | e78d7d7912d4c3f3e976ba324142d83b0f21ba31 /res/res_pjsip/pjsip_configuration.c | |
parent | e106292a9219d1a7977a7e95b86502f0ea027580 (diff) | |
parent | 7760029f19ae4985b9806cb1c882482e2be823a5 (diff) |
Merge "pbx: Deadlock between contexts container and context_merge locks"
Diffstat (limited to 'res/res_pjsip/pjsip_configuration.c')
0 files changed, 0 insertions, 0 deletions