src/managerimpl.h · 2ee8dbb57872dc0593f94753c153423d2d376172 · savoirfairelinux / jami-daemon · GitLab

Find file Blame History Permalink

Merge branch 'master' into recording · 2ee8dbb5
alexandresavard authored Feb 05, 2009
```
Conflicts:

	src/audio/audiortp.cpp
	src/sipvoiplink.cpp
```
2ee8dbb5