Skip to content
Snippets Groups Projects
Commit 22dfbeb8 authored by Julien Bonjean's avatar Julien Bonjean
Browse files

Merge branch 'master' into networkmanager 

Conflicts:
	sflphone-common/src/audio/audiolayer.cpp
	sflphone-common/src/audio/pulseaudio/pulselayer.cpp
	sflphone-common/src/managerimpl.cpp
	sflphone-common/src/sip/sipvoiplink.cpp
	sflphone-common/test/audiolayerTest.cpp
	sflphone-common/test/mainbufferTest.cpp
parents 304b064b 8c3ce76d
No related branches found
No related tags found
Show whitespace changes
Inline Side-by-side
Showing
with 178 additions and 67 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment