-
Alexandre Savard authored
Conflicts: sflphone-common/src/audio/pulseaudio/audiostream.cpp sflphone-common/src/audio/pulseaudio/pulselayer.cpp sflphone-common/src/audio/pulseaudio/pulselayer.h
bc09f360
Conflicts: sflphone-common/src/audio/pulseaudio/audiostream.cpp sflphone-common/src/audio/pulseaudio/pulselayer.cpp sflphone-common/src/audio/pulseaudio/pulselayer.h