-
alexandresavard authored
Conflicts: src/audio/audiortp.cpp src/iaxvoiplink.cpp src/sipvoiplink.cpp src/sipvoiplink.h src/voiplink.h
98c95e44
Conflicts: src/audio/audiortp.cpp src/iaxvoiplink.cpp src/sipvoiplink.cpp src/sipvoiplink.h src/voiplink.h