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

b8eb10ca

Commit b8eb10ca authored 13 years ago by Emmanuel Lepage

Downloads
- Plain Diff

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

parents 967c2faa 62628a02

No related branches found

No related tags found

Loading

Changes 6

Show whitespace changes

Inline Side-by-side

Showing

gnome/src/codeclist.c 43 additions, 54 deletions

gnome/src/codeclist.c
gnome/src/config/accountconfigdialog.c 1 addition, 1 deletion

gnome/src/config/accountconfigdialog.c
gnome/src/config/audioconf.c 21 additions, 13 deletions

gnome/src/config/audioconf.c
gnome/src/config/videoconf.c 3 additions, 3 deletions

gnome/src/config/videoconf.c
kde/src/CallView.cpp 9 additions, 9 deletions

kde/src/CallView.cpp
kde/src/CallView.h 2 additions, 2 deletions

kde/src/CallView.h

with 79 additions and 82 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