Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Register
Sign in
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-daemon
Repository
7d458ecee8c282d327e00b616434452054135a6d
Switch branch/tag
jami-daemon
sflphone-gtk
src
dbus.c
Find file
Blame
History
Permalink
Merge branch 'master' into recording
· 8a3b73d2
Alexandre Savard
authored
Feb 20, 2009
Conflicts: sflphone-gtk/src/sflnotify.c src/audio/audiortp.cpp src/sipvoiplink.cpp
8a3b73d2