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

4d57656e

Commit 4d57656e authored 15 years ago by Alexandre Savard

Downloads
- Plain Diff

Merge branch 'conference'

parents 7e970f79 dce23d4b

Branches

Tags

No related merge requests found

Changes 3

Show whitespace changes

Inline Side-by-side

Showing

sflphone-client-gnome/src/config/accountconfigdialog.c 1 addition, 2 deletions

sflphone-client-gnome/src/config/accountconfigdialog.c
sflphone-client-gnome/src/config/assistant.c 21 additions, 8 deletions

sflphone-client-gnome/src/config/assistant.c
sflphone-common/src/sip/sipvoiplink.cpp 12 additions, 6 deletions

sflphone-common/src/sip/sipvoiplink.cpp

with 34 additions and 16 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