Skip to content
GitLab
Explore
Sign in
Register
savoirfairelinux
jami-daemon
Repository
jami-daemon
sflphone-gtk
src
sflnotify.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