Merge remote-tracking branch 'origin/0.10'

Browse Source

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:

Sebastian Dröge 2012-04-04 12:10:45 +02:00

parent ecf09f45f3 94c5f6dcc9

commit bca1463a66

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available