Skip to content
GitLab
Commit f521b69f authored by Simon Morlat's avatar Simon Morlat
Browse files

Merge branch 'master' into dev_multicall 

Conflicts:
	console/commands.c
	coreapi/callbacks.c
	coreapi/linphonecore.c
	coreapi/sal_eXosip2.c
	mediastreamer2
parents e6e6f38e 2cf2a5b1
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 326 additions and 116 deletions
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment