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

eb19bce6

Commit eb19bce6 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 26c2d259 44e0a09c

Branches

Tags

No related merge requests found

Changes 7

Show whitespace changes

Inline Side-by-side

Showing

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

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

sflphone-common/src/audio/audiolayer.cpp
sflphone-common/src/audio/mainbuffer.cpp 6 additions, 1 deletion

sflphone-common/src/audio/mainbuffer.cpp
sflphone-common/src/audio/pulseaudio/pulselayer.cpp 16 additions, 7 deletions

sflphone-common/src/audio/pulseaudio/pulselayer.cpp
sflphone-common/src/audio/ringbuffer.cpp 5 additions, 2 deletions

sflphone-common/src/audio/ringbuffer.cpp
sflphone-common/src/audio/ringbuffer.h 1 addition, 0 deletions

sflphone-common/src/audio/ringbuffer.h
sflphone-common/src/managerimpl.cpp 22 additions, 7 deletions

sflphone-common/src/managerimpl.cpp

with 60 additions and 22 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