Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

jami-daemon
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Releases
- Model registry
- Incidents

Snippets Groups Projects

2d8c322e

Commit 2d8c322e authored 13 years ago by Alexandre Savard

Downloads
- Plain Diff

Merge branch 'fix_srtp' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into fix_srtp

parents 5ff70fb5 2f0896cf

Branches

Tags

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

daemon/src/audio/audiortp/audio_srtp_session.cpp 3 additions, 3 deletions

daemon/src/audio/audiortp/audio_srtp_session.cpp
daemon/src/sip/sdes_negotiator.cpp 2 additions, 3 deletions

daemon/src/sip/sdes_negotiator.cpp
daemon/src/sip/sdp.cpp 0 additions, 2 deletions

daemon/src/sip/sdp.cpp
daemon/src/sip/sipvoiplink.cpp 8 additions, 8 deletions

daemon/src/sip/sipvoiplink.cpp

with 13 additions and 16 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