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

Merge remote-tracking branch 'private/srtp' 

Conflicts:
	coreapi/linphonecore.c
	coreapi/linphonecore.h
	coreapi/sal_eXosip2.c
	java/common/org/linphone/core/LinphoneCore.java
	oRTP
parents ffb64015 5becaaee
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 634 additions and 129 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