Commit 85f94fd1 authored by Wim Taymans's avatar Wim Taymans

Merge branch 'master' into 0.11

Conflicts:
	ext/opus/gstopusparse.c
	gst/colorspace/colorspace.c
parents bbf95643 81b71b65
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