Wim Taymans ba41bb5ca7 Merge branch 'master' into 0.11 ... Conflicts: ext/ogg/gstoggmux.c gst/playback/gstplaysink.c		2011-08-18 19:36:50 +02:00
..
alsa	audio: rework audio caps.	2011-08-18 19:15:03 +02:00
cdparanoia	Merge branch 'master' into 0.11	2011-05-17 09:31:01 +02:00
gio	giosink: use new query vmethod	2011-07-26 12:47:38 +02:00
libvisual	-base: port elements to new video caps	2011-06-16 12:52:13 +02:00
ogg	Merge branch 'master' into 0.11	2011-08-18 19:36:50 +02:00
pango	Merge branch 'master' into 0.11	2011-08-16 18:01:14 +02:00
theora	Merge branch 'master' into 0.11	2011-08-16 18:01:14 +02:00
vorbis	audio: rework audio caps.	2011-08-18 19:15:03 +02:00
Makefile.am	gnomevfs: remove GnomeVFS plugin	2011-06-15 00:52:47 +01:00