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

bf28b8a9

Commit bf28b8a9 authored 12 years ago by Tristan Matthews

Downloads
- Plain Diff

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

parents 7db69f10 90cc0a5e

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

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

daemon/src/managerimpl.cpp
daemon/src/sip/sipaccount.cpp 1 addition, 0 deletions

daemon/src/sip/sipaccount.cpp
daemon/src/sip/sipaccount.h 13 additions, 0 deletions

daemon/src/sip/sipaccount.h
daemon/src/sip/sipvoiplink.cpp 16 additions, 0 deletions

daemon/src/sip/sipvoiplink.cpp
gnome/src/actions.c 14 additions, 11 deletions

gnome/src/actions.c

with 44 additions and 12 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