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

35895a59

Commit 35895a59 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 9bdfeb99 3a859461

Branches

Tags

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

sflphone-common/src/audio/alsa/alsalayer.cpp 12 additions, 8 deletions

sflphone-common/src/audio/alsa/alsalayer.cpp
sflphone-common/src/audio/audiolayer.cpp 5 additions, 5 deletions

sflphone-common/src/audio/audiolayer.cpp
sflphone-common/src/audio/audiolayer.h 7 additions, 2 deletions

sflphone-common/src/audio/audiolayer.h
sflphone-common/src/audio/pulseaudio/audiostream.cpp 6 additions, 13 deletions

sflphone-common/src/audio/pulseaudio/audiostream.cpp
sflphone-common/src/audio/pulseaudio/pulselayer.cpp 15 additions, 50 deletions

sflphone-common/src/audio/pulseaudio/pulselayer.cpp
sflphone-common/src/managerimpl.cpp 27 additions, 19 deletions

sflphone-common/src/managerimpl.cpp
sflphone-common/src/managerimpl.h 15 additions, 0 deletions

sflphone-common/src/managerimpl.h

with 87 additions and 97 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