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

e9f88993

Commit e9f88993 authored 13 years ago by Tristan Matthews

Downloads
- Plain Diff

Merge branch 'master' of...

Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into audio_buffers

parents 41d62ad1 aadc235d

Branches

Tags

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

daemon/src/sip/sipaccount.cpp 31 additions, 19 deletions

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

daemon/src/sip/sipaccount.h
daemon/src/sip/sipvoiplink.cpp 55 additions, 30 deletions

daemon/src/sip/sipvoiplink.cpp
gnome/src/actions.c 34 additions, 25 deletions

gnome/src/actions.c

with 122 additions and 74 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