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

c1c6734e

Commit c1c6734e authored May 29, 2012 by Tristan Matthews

Downloads
- Plain Diff

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

parents f6ced13e f571f957

No related branches found

No related tags found

No related merge requests found

Changes 8

Show whitespace changes

Inline Side-by-side

Showing

gnome/src/contacts/calltree.c 3 additions, 4 deletions

gnome/src/contacts/calltree.c
gnome/src/mainwindow.c 0 additions, 1 deletion

gnome/src/mainwindow.c
gnome/src/seekslider.c 6 additions, 3 deletions

gnome/src/seekslider.c
kde/src/CallView.cpp 12 additions, 11 deletions

kde/src/CallView.cpp
kde/src/lib/Call.cpp 3 additions, 3 deletions

kde/src/lib/Call.cpp
kde/src/lib/CallModel.cpp 0 additions, 1 deletion

kde/src/lib/CallModel.cpp
kde/src/lib/CallModel.hpp 2 additions, 3 deletions

kde/src/lib/CallModel.hpp
kde/src/widgets/CallTreeItem.cpp 1 addition, 1 deletion

kde/src/widgets/CallTreeItem.cpp

with 27 additions and 27 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