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

Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone 

Conflicts:
	linphone/mediastreamer2/src/msfileplayer_win.c
parents 5bc0e578 d43008a1
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 22 additions and 29 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