sflphone-gtk/src/dbus.c · 7d458ecee8c282d327e00b616434452054135a6d · savoirfairelinux / jami-daemon · GitLab

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