Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

A

asterisk
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

ca65ddcd

Commit ca65ddcd authored 9 years ago by Mark Michelson Committed by Gerrit Code Review 9 years ago

Downloads
- Plain Diff

Merge "bridge.c: Fixed race condition during attended transfer" into 13

parents 6176ef78 97ee0ee6

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

include/asterisk/bridge.h 2 additions, 0 deletions

include/asterisk/bridge.h
include/asterisk/bridge_channel_internal.h 39 additions, 1 deletion

include/asterisk/bridge_channel_internal.h
main/bridge.c 44 additions, 7 deletions

main/bridge.c
main/bridge_channel.c 24 additions, 1 deletion

main/bridge_channel.c

with 109 additions and 9 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment