Merge branch 'master' into 0.11

Browse source

Conflicts:
	ext/pango/gsttextoverlay.c

...

This commit is contained in:

Wim Taymans 2011-08-22 13:14:49 +02:00

parent 3fab57b5cf 7d3858a14d

commit 860782337c

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