Commit b55b08c2 authored by Sandrine Avakian's avatar Sandrine Avakian
Browse files

Merge branch 'master' of git.linphone.org:mediastreamer2 into dev_msfactory

# Conflicts:
#	src/videofilters/mkv.c
parents 81645063 ef599c81
This diff is collapsed.
Markdown is supported
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