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

6d23cda9

Commit 6d23cda9 authored 13 years ago by Emmanuel Milou

Downloads
- Plain Diff

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

parents 5bb15ef8 76547698

Branches

No related tags found

No related merge requests found

Changes 4

Show whitespace changes

Inline Side-by-side

Showing

daemon/src/fileutils.cpp 3 additions, 1 deletion

daemon/src/fileutils.cpp
daemon/src/managerimpl.cpp 1 addition, 1 deletion

daemon/src/managerimpl.cpp
daemon/src/sip/sipvoiplink.cpp 29 additions, 51 deletions

daemon/src/sip/sipvoiplink.cpp
gnome/src/uimanager.c 62 additions, 145 deletions

gnome/src/uimanager.c

with 95 additions and 198 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