diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-06-21 17:54:38 +0200 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-06-21 17:54:38 +0200 |
| commit | c6a3878369c7cd514bc0c2592b25ae4b5ad3e633 (patch) | |
| tree | f8c6dedcc514c92b28cf885b103c1204cfe94096 /docs/plugins | |
| parent | 7988f4c494554a7c3405028af09ae24d21bd2e55 (diff) | |
| parent | 63dbb3b3833148b1dbf7db18ae76c886eb38234f (diff) | |
Merge branch 'master' into 0.11
Conflicts:
configure.ac
win32/common/config.h
win32/common/gstversion.h
Diffstat (limited to 'docs/plugins')
| -rw-r--r-- | docs/plugins/inspect/plugin-coreelements.xml | 4 | ||||
| -rw-r--r-- | docs/plugins/inspect/plugin-coreindexers.xml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/plugins/inspect/plugin-coreelements.xml b/docs/plugins/inspect/plugin-coreelements.xml index aef69a7148..e99c7802aa 100644 --- a/docs/plugins/inspect/plugin-coreelements.xml +++ b/docs/plugins/inspect/plugin-coreelements.xml @@ -3,7 +3,7 @@ <description>standard GStreamer elements</description> <filename>../../plugins/elements/.libs/libgstcoreelements.so</filename> <basename>libgstcoreelements.so</basename> - <version>0.10.34.1</version> + <version>0.10.35.1</version> <license>LGPL</license> <source>gstreamer</source> <package>GStreamer git</package> @@ -331,4 +331,4 @@ </pads> </element> </elements> -</plugin>
\ No newline at end of file +</plugin> diff --git a/docs/plugins/inspect/plugin-coreindexers.xml b/docs/plugins/inspect/plugin-coreindexers.xml index e8d2401b20..80f072e2a5 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.34.1</version> + <version>0.10.35.1</version> <license>LGPL</license> <source>gstreamer</source> <package>GStreamer git</package> <origin>Unknown package origin</origin> <elements> </elements> -</plugin>
\ No newline at end of file +</plugin> |