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

2fce6bfc

Commit 2fce6bfc authored 13 years ago by Tristan Matthews

Downloads
- Plain Diff

Merge branch 'master' of...

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

parents fa4617b2 2cbee41e

No related branches found

No related tags found

No related merge requests found

Changes 10

Show whitespace changes

Inline Side-by-side

Showing

daemon/src/dbus/networkmanager.cpp 4 additions, 1 deletion

daemon/src/dbus/networkmanager.cpp
daemon/src/managerimpl.cpp 0 additions, 1 deletion

daemon/src/managerimpl.cpp
daemon/src/sip/sipaccount.cpp 2 additions, 1 deletion

daemon/src/sip/sipaccount.cpp
daemon/src/sip/sipaccount.h 14 additions, 1 deletion

daemon/src/sip/sipaccount.h
daemon/src/sip/siptransport.cpp 11 additions, 6 deletions

daemon/src/sip/siptransport.cpp
daemon/src/sip/siptransport.h 1 addition, 1 deletion

daemon/src/sip/siptransport.h
daemon/src/sip/sipvoiplink.cpp 22 additions, 7 deletions

daemon/src/sip/sipvoiplink.cpp
gnome/src/actions.c 12 additions, 48 deletions

gnome/src/actions.c
gnome/src/actions.h 1 addition, 1 deletion

gnome/src/actions.h
gnome/src/config/accountconfigdialog.c 1 addition, 1 deletion

gnome/src/config/accountconfigdialog.c

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