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

fdc355a8

Commit fdc355a8 authored 15 years ago by Emmanuel Milou

Downloads
- Plain Diff

Merge branch 'qt-client'

parents 647ec2f0 a1f35fcc

No related branches found

No related tags found

No related merge requests found

Changes 18

Hide whitespace changes

Inline Side-by-side

Showing

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

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

sflphone-client-kde/src/Account.h
sflphone-client-kde/src/AccountList.cpp 4 additions, 1 deletion

sflphone-client-kde/src/AccountList.cpp
sflphone-client-kde/src/CMakeLists.txt 4 additions, 0 deletions

sflphone-client-kde/src/CMakeLists.txt
sflphone-client-kde/src/Call.cpp 12 additions, 16 deletions

sflphone-client-kde/src/Call.cpp
sflphone-client-kde/src/Call.h 55 additions, 2 deletions

sflphone-client-kde/src/Call.h
sflphone-client-kde/src/CallList.cpp 1 addition, 1 deletion

sflphone-client-kde/src/CallList.cpp
sflphone-client-kde/src/Contact.cpp 8 additions, 11 deletions

sflphone-client-kde/src/Contact.cpp
sflphone-client-kde/src/Contact.h 11 additions, 8 deletions

sflphone-client-kde/src/Contact.h
sflphone-client-kde/src/ContactItemWidget.h 2 additions, 0 deletions

sflphone-client-kde/src/ContactItemWidget.h
sflphone-client-kde/src/Item.cpp 22 additions, 0 deletions

sflphone-client-kde/src/Item.cpp
sflphone-client-kde/src/Item.h 92 additions, 0 deletions

sflphone-client-kde/src/Item.h
sflphone-client-kde/src/conf/dlgaccounts.cpp 2 additions, 3 deletions

sflphone-client-kde/src/conf/dlgaccounts.cpp
sflphone-client-kde/src/conf/dlgaudio.cpp 23 additions, 32 deletions

sflphone-client-kde/src/conf/dlgaudio.cpp
sflphone-client-kde/src/conf/dlgaudio.h 0 additions, 1 deletion

sflphone-client-kde/src/conf/dlgaudio.h
sflphone-client-kde/src/conf/dlgaudiobase.ui 25 additions, 22 deletions

sflphone-client-kde/src/conf/dlgaudiobase.ui
sflphone-client-kde/src/sflphone_kdeview.cpp 41 additions, 23 deletions

sflphone-client-kde/src/sflphone_kdeview.cpp
sflphone-client-kde/src/sflphone_kdeview.h 9 additions, 0 deletions

sflphone-client-kde/src/sflphone_kdeview.h

with 323 additions and 131 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