Tim-Philipp Müller 29c266ccff Merge remote-tracking branch 'origin/master' into 0.11 ...

Conflicts:
	common
	docs/libs/gst-plugins-base-libs.types
	ext/pango/gsttextoverlay.c
	ext/vorbis/gstvorbisdec.c
	gst/playback/gstplaysink.c
	gst/playback/gstplaysinkconvertbin.c
	sys/ximage/ximagesink.c
	sys/xvimage/xvimagesink.c

2012-03-08 20:31:34 +00:00

..

ximage

Merge remote-tracking branch 'origin/master' into 0.11

2012-03-08 20:31:34 +00:00

xvimage

Merge remote-tracking branch 'origin/master' into 0.11

2012-03-08 20:31:34 +00:00

Makefile.am

Remove v4l plugin

2011-06-07 20:47:46 +01:00