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

35376081

Commit 35376081 authored 15 years ago by Emmanuel Milou

Downloads
- Plain Diff

Merge branch 'qt-client'

parents afeccb09 b20195a9

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

sflphone-client-kde/src/Account.cpp 1 addition, 0 deletions

sflphone-client-kde/src/Account.cpp
sflphone-client-kde/src/Call.cpp 103 additions, 1 deletion

sflphone-client-kde/src/Call.cpp
sflphone-client-kde/src/Call.h 5 additions, 1 deletion

sflphone-client-kde/src/Call.h
sflphone-client-kde/src/CallList.cpp 26 additions, 0 deletions

sflphone-client-kde/src/CallList.cpp
sflphone-client-kde/src/ConfigDialog.cpp 36 additions, 12 deletions

sflphone-client-kde/src/ConfigDialog.cpp
sflphone-client-kde/src/ConfigDialog.h 2 additions, 1 deletion

sflphone-client-kde/src/ConfigDialog.h
sflphone-client-kde/src/sflphone_const.h 14 additions, 0 deletions

sflphone-client-kde/src/sflphone_const.h
sflphone-client-kde/src/sflphone_kdeview.cpp 20 additions, 2 deletions

sflphone-client-kde/src/sflphone_kdeview.cpp
sflphone-common/src/call.cpp 6 additions, 2 deletions

sflphone-common/src/call.cpp
sflphone-common/src/call.h 1 addition, 1 deletion

sflphone-common/src/call.h
sflphone-common/src/managerimpl.cpp 4 additions, 4 deletions

sflphone-common/src/managerimpl.cpp

with 218 additions and 24 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