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

24753967

Commit 24753967 authored 14 years ago by Emmanuel Milou

Downloads
- Plain Diff

Merge branch 'master' of ssh://git.sflphone.org/var/repos/sflphone/git/sflphone

parents 60e196ec 7e23a8a1

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

sflphone-common/src/audio/audiortp/AudioRtpSession.cpp 0 additions, 6 deletions

sflphone-common/src/audio/audiortp/AudioRtpSession.cpp
sflphone-common/src/audio/audiortp/AudioZrtpSession.cpp 22 additions, 45 deletions

sflphone-common/src/audio/audiortp/AudioZrtpSession.cpp
sflphone-common/src/audio/audiortp/AudioZrtpSession.h 6 additions, 1 deletion

sflphone-common/src/audio/audiortp/AudioZrtpSession.h

with 28 additions and 52 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