diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2012-02-27 00:08:39 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2012-02-27 00:08:39 +0000 |
| commit | 1fbcc71dbdff79d70b0abe1285f694f3d4596564 (patch) | |
| tree | 876b6486db051642823beda8197b656ecdd3c423 /docs | |
| parent | ed29f33ddb6f9a10ff75a53adae525aa165a6ecf (diff) | |
| parent | daa5cae78b35a6997f26949e72b8ecc2dde86ce1 (diff) | |
Merge remote-tracking branch 'origin/master' into 0.11
Conflicts:
NEWS
RELEASE
configure.ac
docs/plugins/gstreamer-plugins.hierarchy
docs/plugins/inspect/plugin-coreelements.xml
libs/gst/base/gstcollectpads.c
libs/gst/base/gstcollectpads2.c
plugins/elements/gstfdsink.c
win32/common/config.h
win32/common/gstenumtypes.c
win32/common/gstversion.h
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/plugins/inspect/plugin-coreindexers.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/plugins/inspect/plugin-coreindexers.xml b/docs/plugins/inspect/plugin-coreindexers.xml index 80f072e2a..8356f0c9e 100644 --- a/docs/plugins/inspect/plugin-coreindexers.xml +++ b/docs/plugins/inspect/plugin-coreindexers.xml @@ -3,11 +3,11 @@ <description>GStreamer core indexers</description> <filename>../../plugins/indexers/.libs/libgstcoreindexers.so</filename> <basename>libgstcoreindexers.so</basename> - <version>0.10.35.1</version> + <version>0.10.36.1</version> <license>LGPL</license> <source>gstreamer</source> <package>GStreamer git</package> <origin>Unknown package origin</origin> <elements> </elements> -</plugin> +</plugin>
\ No newline at end of file |