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

f80d0bc2

Commit f80d0bc2 authored Jun 5, 2012 by Emmanuel Lepage

Downloads
- Plain Diff

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

parents d5eebae9 101f2785

No related branches found

No related tags found

No related merge requests found

Changes 5

Show whitespace changes

Inline Side-by-side

Showing

daemon/src/config/yamlparser.cpp 11 additions, 8 deletions

daemon/src/config/yamlparser.cpp
daemon/src/managerimpl.cpp 4 additions, 0 deletions

daemon/src/managerimpl.cpp
daemon/src/sip/sipvoiplink.cpp 7 additions, 13 deletions

daemon/src/sip/sipvoiplink.cpp
daemon/src/video/video_preferences.cpp 12 additions, 10 deletions

daemon/src/video/video_preferences.cpp
daemon/test/sflphoned-sample.yml 8 additions, 4 deletions

daemon/test/sflphoned-sample.yml

with 42 additions and 35 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please sign in to comment