Wim Taymans a87c021237 Merge branch 'master' into 0.11 ... Conflicts: gst-libs/gst/video/convertframe.c		2011-05-24 09:47:15 +02:00
..
gstcddabasesrc.c	Revert "-base_port to new query API"	2011-05-17 11:25:31 +02:00
gstcddabasesrc.h	docs: add missing documentation for various pieces	2011-05-23 23:56:09 +03:00
Makefile.am	libs: gobject-introspection scanner doesn't need to scan or update plugin info	2011-04-16 11:01:53 +01:00