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

d39124b5

Commit d39124b5 authored 15 years ago by Alexandre Savard

Downloads
- Plain Diff

Merge branch 'm_savard'

parents cfd85b1d f2e3ae16

Branches

Tags

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

sflphone-client-gnome/src/contacts/calltree.c 22 additions, 55 deletions

sflphone-client-gnome/src/contacts/calltree.c
sflphone-common/src/audio/audiortp/AudioZrtpSession.cpp 1 addition, 1 deletion

sflphone-common/src/audio/audiortp/AudioZrtpSession.cpp
sflphone-common/src/audio/audiortp/ZrtpSessionCallback.cpp 10 additions, 8 deletions

sflphone-common/src/audio/audiortp/ZrtpSessionCallback.cpp
sflphone-common/src/audio/pulseaudio/pulselayer.cpp 6 additions, 6 deletions

sflphone-common/src/audio/pulseaudio/pulselayer.cpp
sflphone-common/src/plug-in/audiorecorder/audiorecord.cpp 28 additions, 30 deletions

sflphone-common/src/plug-in/audiorecorder/audiorecord.cpp

with 67 additions and 100 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