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

7870e3eb

Commit 7870e3eb 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 416a764f 6c664591

No related branches found

No related tags found

No related merge requests found

Changes 7

Show whitespace changes

Inline Side-by-side

Showing

daemon/src/history/historyitem.cpp 11 additions, 10 deletions

daemon/src/history/historyitem.cpp
daemon/src/history/historyitem.h 0 additions, 1 deletion

daemon/src/history/historyitem.h
daemon/src/managerimpl.cpp 9 additions, 3 deletions

daemon/src/managerimpl.cpp
daemon/src/managerimpl.h 1 addition, 0 deletions

daemon/src/managerimpl.h
gnome/src/config/accountconfigdialog.c 3 additions, 2 deletions

gnome/src/config/accountconfigdialog.c
gnome/src/config/audioconf.c 5 additions, 5 deletions

gnome/src/config/audioconf.c
gnome/src/mainwindow.c 2 additions, 1 deletion

gnome/src/mainwindow.c

with 31 additions and 22 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