Skip to content
Snippets Groups Projects
Commit b7cf6403 authored by Alexandre Savard's avatar Alexandre Savard
Browse files

Merge branch 'conference' 

Conflicts:
	sflphone-common/src/audio/mainbuffer.cpp
	sflphone-common/src/audio/ringbuffer.cpp
	sflphone-common/src/conference.cpp
	sflphone-common/src/managerimpl.cpp
	sflphone-common/src/sip/sipvoiplink.cpp
parents acb01536 c7adf862
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 600 additions and 584 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment