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

795e6c03

Commit 795e6c03 authored 15 years ago by Emmanuel Milou

Downloads
- Plain Diff

Merge branch 'conference'

parents d10fd709 ec229577

Branches

Tags

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

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

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

sflphone-client-gnome/src/dbus/dbus.c
sflphone-client-gnome/src/uimanager.c 1 addition, 1 deletion

sflphone-client-gnome/src/uimanager.c
sflphone-common/src/audio/ringbuffer.cpp 1 addition, 1 deletion

sflphone-common/src/audio/ringbuffer.cpp
sflphone-common/src/plug-in/audiorecorder/audiorecord.cpp 1 addition, 1 deletion

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

with 11 additions and 11 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