mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-25 09:40:37 +00:00
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
This commit is contained in:
commit
bca1463a66