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

Merge branch 'master' into networkmanager 

Conflicts:
	sflphone-common/src/dbus/configurationmanager.cpp
	sflphone-common/src/managerimpl.cpp
	sflphone-common/src/sip/sipvoiplink.cpp
	sflphone-common/test/audiolayerTest.cpp
	sflphone-common/test/mainbufferTest.cpp
parents 8dea1678 9b057b9e
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 566 additions and 446 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment