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

a36fac3a

Commit a36fac3a authored 15 years ago by Emmanuel Milou

Downloads
- Plain Diff

Merge branch 'conference'

parents 3bd9e46b 447ef7fc

Branches

Tags

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

sflphone-client-gnome/src/actions.c 21 additions, 0 deletions

sflphone-client-gnome/src/actions.c
sflphone-client-gnome/src/contacts/calltab.c 2 additions, 0 deletions

sflphone-client-gnome/src/contacts/calltab.c
sflphone-client-gnome/src/contacts/calltree.c 11 additions, 4 deletions

sflphone-client-gnome/src/contacts/calltree.c
sflphone-client-gnome/src/uimanager.c 67 additions, 2 deletions

sflphone-client-gnome/src/uimanager.c
sflphone-common/src/audio/pulseaudio/audiostream.cpp 9 additions, 2 deletions

sflphone-common/src/audio/pulseaudio/audiostream.cpp
sflphone-common/src/audio/pulseaudio/pulselayer.cpp 3 additions, 7 deletions

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

sflphone-common/src/managerimpl.cpp

with 116 additions and 16 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