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

be21cb37

Commit be21cb37 authored 15 years ago 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 68c95f1f 90375f57

Branches

Tags

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

sflphone-client-gnome/src/accountlist.c 6 additions, 2 deletions

sflphone-client-gnome/src/accountlist.c
sflphone-client-gnome/src/config/accountwindow.c 107 additions, 36 deletions

sflphone-client-gnome/src/config/accountwindow.c
sflphone-common/src/managerimpl.cpp 25 additions, 19 deletions

sflphone-common/src/managerimpl.cpp
sflphone-common/src/sip/sipaccount.h 6 additions, 0 deletions

sflphone-common/src/sip/sipaccount.h
sflphone-common/src/sip/sipvoiplink.cpp 3 additions, 6 deletions

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

sflphone-common/src/sip/sipvoiplink.h

with 148 additions and 64 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