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

2c879d67

Commit 2c879d67 authored 15 years ago by Emmanuel Milou

Downloads
- Plain Diff

Merge branch 'qt-client'

parents 5ded4d32 54b7ec68

No related branches found

No related tags found

Loading

Changes 8

Expand all Show whitespace changes

Inline Side-by-side

Showing

sflphone-client-kde/data/sflphone-client-kdeui.rc 9 additions, 9 deletions

sflphone-client-kde/data/sflphone-client-kdeui.rc
sflphone-client-kde/src/SFLPhone.cpp 172 additions, 57 deletions

sflphone-client-kde/src/SFLPhone.cpp
sflphone-client-kde/src/SFLPhone.h 40 additions, 2 deletions

sflphone-client-kde/src/SFLPhone.h
sflphone-client-kde/src/main.cpp 4 additions, 4 deletions

sflphone-client-kde/src/main.cpp
sflphone-client-kde/src/sflphone_const.h 12 additions, 1 deletion

sflphone-client-kde/src/sflphone_const.h
sflphone-client-kde/src/sflphone_kdeview.cpp 137 additions, 203 deletions

sflphone-client-kde/src/sflphone_kdeview.cpp
sflphone-client-kde/src/sflphone_kdeview.h 34 additions, 15 deletions

sflphone-client-kde/src/sflphone_kdeview.h
sflphone-client-kde/src/ui/sflphone_kdeview_base.ui 0 additions, 127 deletions

sflphone-client-kde/src/ui/sflphone_kdeview_base.ui

with 408 additions and 418 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