Skip to content
Snippets Groups Projects
Commit c6b4d532 authored by Emmanuel Milou's avatar Emmanuel Milou
Browse files

Merge branch 'master' into im 

Conflicts:
	sflphone-common/src/managerimpl.cpp
	sflphone-common/src/sip/sipvoiplink.cpp
	sflphone-common/test/Makefile.am
parents 4b599526 c3023d51
No related branches found
No related tags found
Show whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment