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

68cafe35

Commit 68cafe35 authored 15 years ago by Alexandre Savard

Downloads
- Plain Diff

Merge branch 'conference'

parents bd9a899e 59a295d8

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/alsa/alsalayer.cpp 8 additions, 2 deletions

sflphone-common/src/audio/alsa/alsalayer.cpp
sflphone-common/src/audio/pulseaudio/audiostream.cpp 11 additions, 10 deletions

sflphone-common/src/audio/pulseaudio/audiostream.cpp
sflphone-common/src/audio/pulseaudio/pulselayer.cpp 35 additions, 12 deletions

sflphone-common/src/audio/pulseaudio/pulselayer.cpp
sflphone-common/src/managerimpl.cpp 1 addition, 1 deletion

sflphone-common/src/managerimpl.cpp

with 55 additions and 25 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