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

13f1cdae

Commit 13f1cdae authored 15 years ago by Julien Bonjean

Downloads
- Plain Diff

Merge branch 'master' into jbonjean

parents 5eff3700 ce02ee1c

Branches

Tags

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

sflphone-client-gnome/src/config/accountconfigdialog.c 2 additions, 0 deletions

sflphone-client-gnome/src/config/accountconfigdialog.c
sflphone-client-gnome/src/mainwindow.c 1 addition, 0 deletions

sflphone-client-gnome/src/mainwindow.c
sflphone-common/src/audio/pulseaudio/audiostream.cpp 12 additions, 10 deletions

sflphone-common/src/audio/pulseaudio/audiostream.cpp
sflphone-common/src/audio/pulseaudio/pulselayer.cpp 98 additions, 41 deletions

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

sflphone-common/src/audio/pulseaudio/pulselayer.h
sflphone-common/src/managerimpl.cpp 3 additions, 1 deletion

sflphone-common/src/managerimpl.cpp

with 120 additions and 54 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