Merge branch 'master' into 0.11

Browse source

Conflicts:
	common
	configure.ac
	gst/colorspace/colorspace.c
	gst/colorspace/colorspace.h
	gst/colorspace/gstcolorspace.c

...

This commit is contained in:

Wim Taymans 2011-08-04 09:36:07 +02:00

parent 3687fe05e4 81b71b65ee

commit 55aba366e4

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 is not available