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

33b0de00

Commit 33b0de00 authored 15 years ago by Alexandre Savard

Downloads
- Plain Diff

Merge branch 'm_savard'

parents a38aada5 40cdb895

Branches

Tags

No related merge requests found

Changes 7

Show whitespace changes

Inline Side-by-side

Showing

sflphone-client-gnome/src/config/accountconfigdialog.c 14 additions, 11 deletions

sflphone-client-gnome/src/config/accountconfigdialog.c
sflphone-client-gnome/src/sflphone_const.h 1 addition, 1 deletion

sflphone-client-gnome/src/sflphone_const.h
sflphone-common/src/account.h 1 addition, 1 deletion

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

sflphone-common/src/managerimpl.cpp
sflphone-common/src/sip/sipaccount.cpp 5 additions, 11 deletions

sflphone-common/src/sip/sipaccount.cpp
sflphone-common/src/sip/sipaccount.h 5 additions, 5 deletions

sflphone-common/src/sip/sipaccount.h
sflphone-common/src/sip/sipvoiplink.cpp 28 additions, 5 deletions

sflphone-common/src/sip/sipvoiplink.cpp

with 62 additions and 42 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