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

c9fcca77

Commit c9fcca77 authored 15 years ago by Julien Bonjean

Downloads
- Plain Diff

Merge branch 'master' into jbonjean

parents a22b5955 3d2a5409

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

sflphone-common/src/audio/alsa/alsalayer.cpp 168 additions, 49 deletions

sflphone-common/src/audio/alsa/alsalayer.cpp
sflphone-common/src/audio/alsa/alsalayer.h 3 additions, 4 deletions

sflphone-common/src/audio/alsa/alsalayer.h
sflphone-common/src/audio/pulseaudio/audiostream.cpp 8 additions, 8 deletions

sflphone-common/src/audio/pulseaudio/audiostream.cpp
sflphone-common/src/audio/pulseaudio/pulselayer.cpp 13 additions, 14 deletions

sflphone-common/src/audio/pulseaudio/pulselayer.cpp
sflphone-common/src/managerimpl.cpp 7 additions, 10 deletions

sflphone-common/src/managerimpl.cpp

with 199 additions and 85 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