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

be9c99ef

Commit be9c99ef authored 13 years ago by Emmanuel Lepage

Downloads
- Plain Diff

Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone

parents 4e17ba36 df71ac47

No related branches found

No related tags found

No related merge requests found

Changes 7

Show whitespace changes

Inline Side-by-side

Showing

daemon/src/audio/alsa/alsalayer.cpp 21 additions, 12 deletions

daemon/src/audio/alsa/alsalayer.cpp
daemon/src/audio/alsa/alsalayer.h 6 additions, 10 deletions

daemon/src/audio/alsa/alsalayer.h
daemon/src/audio/audiolayer.h 2 additions, 3 deletions

daemon/src/audio/audiolayer.h
daemon/src/audio/pulseaudio/pulselayer.cpp 10 additions, 9 deletions

daemon/src/audio/pulseaudio/pulselayer.cpp
daemon/src/audio/pulseaudio/pulselayer.h 2 additions, 1 deletion

daemon/src/audio/pulseaudio/pulselayer.h
daemon/src/managerimpl.cpp 21 additions, 45 deletions

daemon/src/managerimpl.cpp
daemon/src/managerimpl.h 1 addition, 1 deletion

daemon/src/managerimpl.h

with 63 additions and 81 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