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

59e11467

Commit 59e11467 authored 15 years ago by Alexandre Savard

Downloads
- Plain Diff

Merge branch 'master' into conference

parents 7d742106 eb19bce6

No related branches found

No related tags found

No related merge requests found

Changes 7

Show whitespace changes

Inline Side-by-side

Showing

sflphone-client-gnome/Makefile.am 1 addition, 1 deletion

sflphone-client-gnome/Makefile.am
sflphone-client-gnome/sflphone.desktop.in 1 addition, 1 deletion

sflphone-client-gnome/sflphone.desktop.in
sflphone-client-gnome/src/ui.xml 6 additions, 0 deletions

sflphone-client-gnome/src/ui.xml
sflphone-client-gnome/src/uimanager.c 15 additions, 17 deletions

sflphone-client-gnome/src/uimanager.c
sflphone-common/src/managerimpl.cpp 4 additions, 2 deletions

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

sflphone-common/src/sip/sipaccount.cpp
sflphone-common/src/sip/sipvoiplink.h 1 addition, 1 deletion

sflphone-common/src/sip/sipvoiplink.h

with 32 additions and 26 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