gstreamer/docs/plugins
Wim Taymans c44cd8f55b Merge branch 'master' into 0.11
unport gdkpixbuf
not merged: https://bugzilla.gnome.org/show_bug.cgi?id=654850

Conflicts:
	docs/plugins/Makefile.am
	docs/plugins/gst-plugins-good-plugins-docs.sgml
	docs/plugins/gst-plugins-good-plugins-sections.txt
	docs/plugins/gst-plugins-good-plugins.hierarchy
	docs/plugins/inspect/plugin-avi.xml
	docs/plugins/inspect/plugin-png.xml
	ext/flac/gstflacdec.c
	ext/flac/gstflacdec.h
	ext/libpng/gstpngdec.c
	ext/libpng/gstpngenc.c
	ext/speex/gstspeexdec.c
	gst/audioparsers/gstflacparse.c
	gst/flv/gstflvmux.c
	gst/rtp/gstrtpdvdepay.c
	gst/rtp/gstrtph264depay.c
2012-03-22 11:53:24 +01:00
..
inspect Merge branch 'master' into 0.11 2012-03-22 11:53:24 +01:00
.gitignore
gst-plugins-good-plugins-docs.sgml docs: update docs for new properties and add gdkpixbufoverlay element 2012-03-18 00:17:21 +00:00
gst-plugins-good-plugins-sections.txt docs: update docs for new properties and add gdkpixbufoverlay element 2012-03-18 00:17:21 +00:00
gst-plugins-good-plugins.args Merge branch 'master' into 0.11 2012-03-22 11:53:24 +01:00
gst-plugins-good-plugins.hierarchy docs: update docs for new properties and add gdkpixbufoverlay element 2012-03-18 00:17:21 +00:00
gst-plugins-good-plugins.interfaces Bump version after release 2012-02-23 11:14:30 +00:00
gst-plugins-good-plugins.prerequisites RELEASE 0.11.1 2012-02-17 11:04:47 +01:00
gst-plugins-good-plugins.signals RELEASE 0.11.1 2012-02-17 11:04:47 +01:00
gst-plugins-good-plugins.types videomixer2: Add documentation and add to the docs 2010-09-04 14:55:43 +02:00
inspect-build.stamp
inspect.stamp
Makefile.am docs: update docs for new properties and add gdkpixbufoverlay element 2012-03-18 00:17:21 +00:00
scanobj-build.stamp