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

1ac2bbf0

Commit 1ac2bbf0 authored 15 years ago by Emmanuel Milou

Downloads
- Plain Diff

Merge branch 'master' of...

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

parents bcdb30a3 db96fac6

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

sflphone-common/src/audio/audiortp/AudioRtpFactory.cpp 14 additions, 14 deletions

sflphone-common/src/audio/audiortp/AudioRtpFactory.cpp
sflphone-common/src/audio/audiortp/AudioRtpFactory.h 21 additions, 21 deletions

sflphone-common/src/audio/audiortp/AudioRtpFactory.h
sflphone-common/src/audio/audiortp/AudioRtpSession.h 56 additions, 55 deletions

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

sflphone-common/src/audio/audiortp/AudioZrtpSession.cpp
sflphone-common/src/audio/audiortp/AudioZrtpSession.h 2 additions, 2 deletions

sflphone-common/src/audio/audiortp/AudioZrtpSession.h
sflphone-common/src/audio/audiortp/ZrtpSessionCallback.cpp 3 additions, 4 deletions

sflphone-common/src/audio/audiortp/ZrtpSessionCallback.cpp
sflphone-common/src/sip/sdp.cpp 4 additions, 7 deletions

sflphone-common/src/sip/sdp.cpp
sflphone-common/src/sip/sipvoiplink.cpp 23 additions, 22 deletions

sflphone-common/src/sip/sipvoiplink.cpp

with 123 additions and 126 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