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

49771355

Commit 49771355 authored 15 years ago by Jérémy Quentin

Downloads
- Plain Diff

Merge branch 'master' into qt-client

Conflicts:
	sflphone-client-gnome/src/config/configwindow.c

parents 9e84664f 4188c6eb

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

sflphone-common/src/audio/audiortp.cpp 26 additions, 9 deletions

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

sflphone-common/src/audio/audiostream.cpp
sflphone-common/src/sdp.cpp 12 additions, 2 deletions

sflphone-common/src/sdp.cpp
sflphone-common/src/sipvoiplink.cpp 82 additions, 14 deletions

sflphone-common/src/sipvoiplink.cpp

with 122 additions and 27 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