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

647ec2f0

Commit 647ec2f0 authored 15 years ago by Emmanuel Milou

Downloads
- Plain Diff

Merge branch 'pierre-luc'

parents a9dfb021 c92f34c1

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 0 additions, 4 deletions

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

sflphone-common/src/audio/audiostream.cpp
sflphone-common/src/audio/audiostream.h 14 additions, 4 deletions

sflphone-common/src/audio/audiostream.h
sflphone-common/src/audio/pulselayer.cpp 29 additions, 25 deletions

sflphone-common/src/audio/pulselayer.cpp
sflphone-common/src/audio/pulselayer.h 0 additions, 1 deletion

sflphone-common/src/audio/pulselayer.h
sflphone-common/src/sipvoiplink.cpp 3 additions, 21 deletions

sflphone-common/src/sipvoiplink.cpp

with 71 additions and 70 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