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

6683a03b

Commit 6683a03b authored 15 years ago by Emmanuel Milou

Downloads
- Plain Diff

Merge branch 'conference'

parents 47476794 eafd7b2c

No related branches found

No related tags found

No related merge requests found

Changes 3

Show whitespace changes

Inline Side-by-side

Showing

sflphone-client-gnome/src/config/accountconfigdialog.c 15 additions, 14 deletions

sflphone-client-gnome/src/config/accountconfigdialog.c
sflphone-client-gnome/src/config/preferencesdialog.c 98 additions, 7 deletions

sflphone-client-gnome/src/config/preferencesdialog.c
sflphone-common/src/dbus/configurationmanager.cpp 3 additions, 0 deletions

sflphone-common/src/dbus/configurationmanager.cpp

with 116 additions and 21 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