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

d053eec3

Commit d053eec3 authored 15 years ago by Emmanuel Milou

Downloads
- Plain Diff

Merge branch 'qt-client'

Conflicts:
	sflphone-common/src/managerimpl.cpp

parents 97576476 5cee703b

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

lang/fr/sflphone.po 2 additions, 2 deletions

lang/fr/sflphone.po
sflphone-client-kde/src/conf/ConfigurationSkeleton.cpp 6 additions, 8 deletions

sflphone-client-kde/src/conf/ConfigurationSkeleton.cpp
sflphone-client-kde/src/conf/ConfigurationSkeleton.h 6 additions, 2 deletions

sflphone-client-kde/src/conf/ConfigurationSkeleton.h
sflphone-client-kde/src/conf/dlgaccounts.cpp 7 additions, 8 deletions

sflphone-client-kde/src/conf/dlgaccounts.cpp
sflphone-client-kde/src/conf/dlgaccounts.h 13 additions, 0 deletions

sflphone-client-kde/src/conf/dlgaccounts.h
sflphone-client-kde/src/conf/dlgaccountsbase.ui 1 addition, 1 deletion

sflphone-client-kde/src/conf/dlgaccountsbase.ui
sflphone-client-kde/src/conf/dlgaudio.cpp 0 additions, 5 deletions

sflphone-client-kde/src/conf/dlgaudio.cpp
sflphone-client-kde/src/sflphone_const.h 1 addition, 0 deletions

sflphone-client-kde/src/sflphone_const.h
sflphone-common/src/dbus/configurationmanager.cpp 5 additions, 7 deletions

sflphone-common/src/dbus/configurationmanager.cpp
sflphone-common/src/managerimpl.cpp 12 additions, 5 deletions

sflphone-common/src/managerimpl.cpp

with 53 additions and 38 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