Commit 5e8cf7fe authored by Wim Taymans's avatar Wim Taymans
Browse files

Merge branch 'master' into 0.11

Conflicts:
	libs/gst/base/gstbasetransform.c
parents 6da5841d 1aa5b76a
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