Commit bca1463a authored by Sebastian Dröge's avatar Sebastian Dröge

Merge remote-tracking branch 'origin/0.10'

Conflicts:
	gst/matroska/matroska-demux.c
	gst/matroska/matroska-mux.c
	gst/matroska/matroska-read-common.c
	gst/matroska/matroska-read-common.h
parents ecf09f45 94c5f6dc
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