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

c2be64fc

Commit c2be64fc authored 15 years ago by Emmanuel Milou

Downloads
- Plain Diff

Merge branch 'conference' into release

parents 760939db 80e4ddb2

Branches

Tags

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

sflphone-common/src/managerimpl.cpp 4 additions, 1 deletion

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

sflphone-common/src/sip/sipaccount.cpp
sflphone-common/src/sip/sipvoiplink.cpp 11 additions, 7 deletions

sflphone-common/src/sip/sipvoiplink.cpp

with 17 additions and 10 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