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

670e2a2f

Commit 670e2a2f authored 12 years ago by Tristan Matthews

Downloads
- Plain Diff

Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone

parents 99e6a3b6 008c8846

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

kde/src/SFLPhoneView.cpp 2 additions, 2 deletions

kde/src/SFLPhoneView.cpp
kde/src/klib/HelperFunctions.cpp 12 additions, 1 deletion

kde/src/klib/HelperFunctions.cpp
kde/src/klib/dataengine/sflphonEngine.cpp 45 additions, 16 deletions

kde/src/klib/dataengine/sflphonEngine.cpp
kde/src/klib/dataengine/sflphonEngine.h 2 additions, 0 deletions

kde/src/klib/dataengine/sflphonEngine.h
kde/src/klib/dataengine/sflphone.operations 23 additions, 0 deletions

kde/src/klib/dataengine/sflphone.operations
kde/src/klib/dataengine/sflphoneService.cpp 13 additions, 1 deletion

kde/src/klib/dataengine/sflphoneService.cpp
kde/src/klib/dataengine/sflphoneService.h 80 additions, 1 deletion

kde/src/klib/dataengine/sflphoneService.h
kde/src/lib/Contact.cpp 2 additions, 2 deletions

kde/src/lib/Contact.cpp

with 179 additions and 23 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