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

006784eb

Commit 006784eb authored Nov 12, 2009 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 53e6b77c aa234a42

Branches

Tags

No related merge requests found

Changes 10

Show whitespace changes

Inline Side-by-side

Showing

sflphone-client-gnome/src/config/preferencesdialog.c 27 additions, 11 deletions

sflphone-client-gnome/src/config/preferencesdialog.c
sflphone-client-gnome/src/dbus/configurationmanager-introspec.xml 4 additions, 4 deletions

...-client-gnome/src/dbus/configurationmanager-introspec.xml
sflphone-client-gnome/src/dbus/dbus.c 9 additions, 9 deletions

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

sflphone-client-gnome/src/dbus/dbus.h
sflphone-common/src/dbus/configurationmanager-introspec.xml 4 additions, 4 deletions

sflphone-common/src/dbus/configurationmanager-introspec.xml
sflphone-common/src/dbus/configurationmanager.cpp 8 additions, 6 deletions

sflphone-common/src/dbus/configurationmanager.cpp
sflphone-common/src/dbus/configurationmanager.h 2 additions, 2 deletions

sflphone-common/src/dbus/configurationmanager.h
sflphone-common/src/managerimpl.cpp 28 additions, 9 deletions

sflphone-common/src/managerimpl.cpp
sflphone-common/src/managerimpl.h 2 additions, 2 deletions

sflphone-common/src/managerimpl.h
sflphone-common/src/sip/sipvoiplink.cpp 1 addition, 1 deletion

sflphone-common/src/sip/sipvoiplink.cpp

with 87 additions and 50 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please sign in to comment