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

16310f72

Commit 16310f72 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 e69713b2 608ed45f

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

sflphone-client-gnome/doc/C/sflphone.xml 30 additions, 22 deletions

sflphone-client-gnome/doc/C/sflphone.xml
sflphone-common/src/audio/pulseaudio/audiostream.cpp 11 additions, 11 deletions

sflphone-common/src/audio/pulseaudio/audiostream.cpp
sflphone-common/src/audio/pulseaudio/pulselayer.cpp 38 additions, 5 deletions

sflphone-common/src/audio/pulseaudio/pulselayer.cpp
sflphone-common/src/audio/pulseaudio/pulselayer.h 2 additions, 0 deletions

sflphone-common/src/audio/pulseaudio/pulselayer.h
sflphone-common/src/managerimpl.cpp 9 additions, 0 deletions

sflphone-common/src/managerimpl.cpp

with 90 additions and 38 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