Merge branch 'master' into 0.11

Browse Source

Conflicts:
	configure.ac
	ext/kate/gstkateenc.c
	gst/colorspace/colorspace.c
	gst/mpegvideoparse/mpegvideoparse.c

...

This commit is contained in:

Sebastian Dröge 2012-01-25 13:22:43 +01:00

parent 9740bc771d

commit ba014b1ae0

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