[Pkg-gstreamer-commits] [SCM] GStreamer Ugly Plugins 1.0 Packaging branch, master, updated. debian/0.11.91-1-6-gc4b7cf8

[Sebastian Dröge]

The following commit has been merged in the master branch:
commit 959b1b8183cd63b6a33187020f07cf9699dc0fac
Merge: ce2dfb1d4b56e23c91282f01a301b2b684effa44 1e844f15ece858283240e17ddd58140e6bb7e975
Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Fri Jun 8 13:29:23 2012 +0200

    Merge branch 'upstream'
    
    Conflicts:
    	ChangeLog
    	NEWS
    	RELEASE
    	configure
    	configure.ac
    	docs/plugins/html/ch01.html
    	docs/plugins/html/ch02.html
    	docs/plugins/html/gst-plugins-ugly-plugins-a52dec.html
    	docs/plugins/html/gst-plugins-ugly-plugins-amrnbdec.html
    	docs/plugins/html/gst-plugins-ugly-plugins-amrnbenc.html
    	docs/plugins/html/gst-plugins-ugly-plugins-amrwbdec.html
    	docs/plugins/html/gst-plugins-ugly-plugins-cdiocddasrc.html
    	docs/plugins/html/gst-plugins-ugly-plugins-lamemp3enc.html
    	docs/plugins/html/gst-plugins-ugly-plugins-mad.html
    	docs/plugins/html/gst-plugins-ugly-plugins-plugin-a52dec.html
    	docs/plugins/html/gst-plugins-ugly-plugins-plugin-amrnb.html
    	docs/plugins/html/gst-plugins-ugly-plugins-plugin-amrwbdec.html
    	docs/plugins/html/gst-plugins-ugly-plugins-plugin-asf.html
    	docs/plugins/html/gst-plugins-ugly-plugins-plugin-cdio.html
    	docs/plugins/html/gst-plugins-ugly-plugins-plugin-dvdlpcmdec.html
    	docs/plugins/html/gst-plugins-ugly-plugins-plugin-dvdread.html
    	docs/plugins/html/gst-plugins-ugly-plugins-plugin-dvdsub.html
    	docs/plugins/html/gst-plugins-ugly-plugins-plugin-lame.html
    	docs/plugins/html/gst-plugins-ugly-plugins-plugin-mad.html
    	docs/plugins/html/gst-plugins-ugly-plugins-plugin-mpeg2dec.html
    	docs/plugins/html/gst-plugins-ugly-plugins-plugin-realmedia.html
    	docs/plugins/html/gst-plugins-ugly-plugins-plugin-siddec.html
    	docs/plugins/html/gst-plugins-ugly-plugins-plugin-synaesthesia.html
    	docs/plugins/html/gst-plugins-ugly-plugins-plugin-twolame.html
    	docs/plugins/html/gst-plugins-ugly-plugins-plugin-x264.html
    	docs/plugins/html/gst-plugins-ugly-plugins-rademux.html
    	docs/plugins/html/gst-plugins-ugly-plugins-rdtmanager.html
    	docs/plugins/html/gst-plugins-ugly-plugins-rmdemux.html
    	docs/plugins/html/gst-plugins-ugly-plugins-rtspreal.html
    	docs/plugins/html/gst-plugins-ugly-plugins-rtspwms.html
    	docs/plugins/html/gst-plugins-ugly-plugins-siddec.html
    	docs/plugins/html/gst-plugins-ugly-plugins-synaesthesia.html
    	docs/plugins/html/gst-plugins-ugly-plugins-twolame.html
    	docs/plugins/html/gst-plugins-ugly-plugins-x264enc.html
    	docs/plugins/html/gst-plugins-ugly-plugins-xingmux.html
    	docs/plugins/html/gst-plugins-ugly-plugins.devhelp2
    	docs/plugins/html/index.html
    	gst-plugins-ugly.doap
    	gst-plugins-ugly.spec
    	po/af.gmo
    	po/af.po
    	po/az.gmo
    	po/az.po
    	po/bg.gmo
    	po/bg.po
    	po/ca.gmo
    	po/ca.po
    	po/cs.gmo
    	po/cs.po
    	po/da.gmo
    	po/da.po
    	po/de.gmo
    	po/de.po
    	po/el.gmo
    	po/el.po
    	po/en_GB.gmo
    	po/en_GB.po
    	po/eo.gmo
    	po/eo.po
    	po/es.gmo
    	po/es.po
    	po/eu.gmo
    	po/eu.po
    	po/fi.gmo
    	po/fi.po
    	po/fr.gmo
    	po/fr.po
    	po/gl.gmo
    	po/gl.po
    	po/gst-plugins-ugly-1.0.pot
    	po/hu.gmo
    	po/hu.po
    	po/id.gmo
    	po/id.po
    	po/it.gmo
    	po/it.po
    	po/ja.gmo
    	po/ja.po
    	po/lt.gmo
    	po/lt.po
    	po/lv.gmo
    	po/lv.po
    	po/ms.gmo
    	po/ms.po
    	po/mt.gmo
    	po/mt.po
    	po/nb.gmo
    	po/nb.po
    	po/nl.gmo
    	po/nl.po
    	po/or.gmo
    	po/or.po
    	po/pl.gmo
    	po/pl.po
    	po/pt_BR.gmo
    	po/pt_BR.po
    	po/ro.gmo
    	po/ro.po
    	po/ru.gmo
    	po/ru.po
    	po/sk.gmo
    	po/sk.po
    	po/sl.gmo
    	po/sl.po
    	po/sq.gmo
    	po/sq.po
    	po/sr.gmo
    	po/sr.po
    	po/sv.gmo
    	po/sv.po
    	po/tr.gmo
    	po/tr.po
    	po/uk.gmo
    	po/uk.po
    	po/vi.gmo
    	po/vi.po
    	po/zh_CN.gmo
    	po/zh_CN.po
    	win32/common/config.h


-- 
GStreamer Ugly Plugins 1.0 Packaging