Merge branch 'master' into 0.11

Browse Source

Conflicts:
	ext/opus/gstopusparse.c
	gst/colorspace/colorspace.c

...

This commit is contained in:

Wim Taymans 2012-02-20 16:07:50 +01:00

parent e45e7a3d1f

commit 0dbfad52d9

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