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

56031e4f

Commit 56031e4f authored 15 years ago by Emmanuel Milou

Downloads
- Plain Diff

Merge branch 'qt-client'

parents 47f116f2 710790c9

Branches

Tags

No related merge requests found

Changes 16

Hide whitespace changes

Inline Side-by-side

Showing

sflphone-client-kde/po/CMakeLists.txt 5 additions, 0 deletions

sflphone-client-kde/po/CMakeLists.txt
sflphone-client-kde/src/Account.cpp 12 additions, 2 deletions

sflphone-client-kde/src/Account.cpp
sflphone-client-kde/src/Account.h 5 additions, 3 deletions

sflphone-client-kde/src/Account.h
sflphone-client-kde/src/AccountList.cpp 15 additions, 15 deletions

sflphone-client-kde/src/AccountList.cpp
sflphone-client-kde/src/AccountList.h 6 additions, 6 deletions

sflphone-client-kde/src/AccountList.h
sflphone-client-kde/src/AccountListModel.cpp 139 additions, 0 deletions

sflphone-client-kde/src/AccountListModel.cpp
sflphone-client-kde/src/AccountListModel.h 60 additions, 0 deletions

sflphone-client-kde/src/AccountListModel.h
sflphone-client-kde/src/CMakeLists.txt 1 addition, 0 deletions

sflphone-client-kde/src/CMakeLists.txt
sflphone-client-kde/src/CodecListModel.cpp 0 additions, 3 deletions

sflphone-client-kde/src/CodecListModel.cpp
sflphone-client-kde/src/CodecListModel.h 1 addition, 3 deletions

sflphone-client-kde/src/CodecListModel.h
sflphone-client-kde/src/conf/ConfigurationDialog.h 8 additions, 0 deletions

sflphone-client-kde/src/conf/ConfigurationDialog.h
sflphone-client-kde/src/conf/ConfigurationSkeleton.cpp 1 addition, 1 deletion

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

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

sflphone-client-kde/src/conf/dlgaccounts.cpp
sflphone-client-kde/src/main.cpp 6 additions, 2 deletions

sflphone-client-kde/src/main.cpp
sflphone-client-kde/src/sflphone_const.h 0 additions, 15 deletions

sflphone-client-kde/src/sflphone_const.h

with 282 additions and 68 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