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