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

cbcd0cd7

Commit cbcd0cd7 authored 15 years ago by Emmanuel Milou

Downloads
- Plain Diff

Merge branch 'pierre-luc'

parents d746d12b 09859ec5

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

sflphone-common/src/audio/audiortp.cpp 1 addition, 18 deletions

sflphone-common/src/audio/audiortp.cpp
sflphone-common/src/audio/audiortp.h 4 additions, 5 deletions

sflphone-common/src/audio/audiortp.h
sflphone-common/src/sdp.cpp 9 additions, 13 deletions

sflphone-common/src/sdp.cpp
sflphone-common/src/sdp.h 4 additions, 4 deletions

sflphone-common/src/sdp.h
sflphone-common/src/sipvoiplink.cpp 28 additions, 108 deletions

sflphone-common/src/sipvoiplink.cpp
sflphone-common/src/sipvoiplink.h 5 additions, 2 deletions

sflphone-common/src/sipvoiplink.h

with 51 additions and 150 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