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

98f897e7

Commit 98f897e7 authored 13 years ago by Tristan Matthews

Downloads
- Plain Diff

Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone

parents cc120af6 db7e48f0

Branches

Tags

No related merge requests found

Changes 8

Show whitespace changes

Inline Side-by-side

Showing

daemon/src/dbus/configurationmanager.cpp 2 additions, 2 deletions

daemon/src/dbus/configurationmanager.cpp
daemon/src/managerimpl.cpp 1 addition, 27 deletions

daemon/src/managerimpl.cpp
daemon/src/managerimpl.h 0 additions, 11 deletions

daemon/src/managerimpl.h
daemon/src/preferences.cpp 28 additions, 0 deletions

daemon/src/preferences.cpp
daemon/src/preferences.h 9 additions, 43 deletions

daemon/src/preferences.h
daemon/src/sip/sipvoiplink.cpp 68 additions, 39 deletions

daemon/src/sip/sipvoiplink.cpp
daemon/src/sip/sipvoiplink.h 2 additions, 2 deletions

daemon/src/sip/sipvoiplink.h
gnome/src/uimanager.c 311 additions, 279 deletions

gnome/src/uimanager.c

with 421 additions and 403 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