diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-04-18 10:23:45 +0200 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-04-18 10:23:45 +0200 |
| commit | 7555d0949f231f2263b45b0e791a1884fdc2c771 (patch) | |
| tree | f4a09aefcf97006a60303e8b93392de6b18788f7 /docs/plugins/inspect/plugin-multipart.xml | |
| parent | 8a4ae3dd2de4de1a11d982102e3881e313d4f37a (diff) | |
| parent | 75d5c41f2903b6703aa4d70b5f9fce6db1ad1e03 (diff) | |
| download | gstreamer-plugins-good-7555d0949f231f2263b45b0e791a1884fdc2c771.tar.gz | |
Merge branch 'master' into 0.11
Conflicts:
android/apetag.mk
android/avi.mk
android/flv.mk
android/icydemux.mk
android/id3demux.mk
android/qtdemux.mk
android/rtp.mk
android/rtpmanager.mk
android/rtsp.mk
android/soup.mk
android/udp.mk
android/wavenc.mk
android/wavparse.mk
configure.ac
Diffstat (limited to 'docs/plugins/inspect/plugin-multipart.xml')
| -rw-r--r-- | docs/plugins/inspect/plugin-multipart.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/plugins/inspect/plugin-multipart.xml b/docs/plugins/inspect/plugin-multipart.xml index c5f93e9d8..64fcd8ebc 100644 --- a/docs/plugins/inspect/plugin-multipart.xml +++ b/docs/plugins/inspect/plugin-multipart.xml @@ -3,10 +3,10 @@ <description>multipart stream manipulation</description> <filename>../../gst/multipart/.libs/libgstmultipart.so</filename> <basename>libgstmultipart.so</basename> - <version>0.10.28.1</version> + <version>0.10.28.2</version> <license>LGPL</license> <source>gst-plugins-good</source> - <package>GStreamer Good Plug-ins git</package> + <package>GStreamer Good Plug-ins prerelease</package> <origin>Unknown package origin</origin> <elements> <element> |