Sebastian Dröge 68c0790817 Merge branch 'master' into 0.11 ... Conflicts: gst-libs/gst/interfaces/propertyprobe.c sys/xvimage/xvimagesink.c		2012-01-25 11:50:54 +01:00
..
ximage	Remove compatibility code cruft for old GLib versions	2012-01-18 17:22:21 +00:00
xvimage	Merge branch 'master' into 0.11	2012-01-25 11:50:54 +01:00
Makefile.am	Remove v4l plugin	2011-06-07 20:47:46 +01:00