[Pkg-gstreamer-commits] [gst-plugins-ugly1.0] 04/05: Merge tag 'upstream/1.2.0'
Sebastian Dröge
slomo at alioth.debian.org
Tue Sep 24 15:14:59 UTC 2013
This is an automated email from the git hooks/post-receive script.
slomo pushed a commit to branch master
in repository gst-plugins-ugly1.0.
commit 70fa8c2c2056917c253d7b20c10174a28bb644ce
Merge: 712ca5a c8a6711
Author: Sebastian Dröge <slomo at circular-chaos.org>
Date: Tue Sep 24 16:51:53 2013 +0200
Merge tag 'upstream/1.2.0'
Upstream version 1.2.0
Conflicts:
ChangeLog
NEWS
RELEASE
configure
configure.ac
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-twolame.html
docs/plugins/html/gst-plugins-ugly-plugins-plugin-x264.html
docs/plugins/html/index.html
docs/plugins/inspect/plugin-a52dec.xml
docs/plugins/inspect/plugin-amrnb.xml
docs/plugins/inspect/plugin-amrwbdec.xml
docs/plugins/inspect/plugin-asf.xml
docs/plugins/inspect/plugin-cdio.xml
docs/plugins/inspect/plugin-dvdlpcmdec.xml
docs/plugins/inspect/plugin-dvdread.xml
docs/plugins/inspect/plugin-dvdsub.xml
docs/plugins/inspect/plugin-lame.xml
docs/plugins/inspect/plugin-mad.xml
docs/plugins/inspect/plugin-mpeg2dec.xml
docs/plugins/inspect/plugin-realmedia.xml
docs/plugins/inspect/plugin-siddec.xml
docs/plugins/inspect/plugin-twolame.xml
docs/plugins/inspect/plugin-x264.xml
docs/plugins/inspect/plugin-xingmux.xml
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/hr.gmo
po/hr.po
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
ChangeLog | 106 ++++++++++++++++-
NEWS | 123 +++++++++++++++++++-
RELEASE | 15 +--
autogen.sh | 12 +-
common/check.mak | 6 +-
common/extract-release-date-from-doap-file | 8 +-
common/gst.supp | 8 ++
common/m4/gst-args.m4 | 9 +-
common/m4/gst-glib2.m4 | 12 +-
common/m4/gst-package-release-datetime.m4 | 4 +-
configure | 61 +++++-----
configure.ac | 8 +-
.../gst-plugins-ugly-plugins-plugin-a52dec.html | 2 +-
.../gst-plugins-ugly-plugins-plugin-amrnb.html | 2 +-
.../gst-plugins-ugly-plugins-plugin-amrwbdec.html | 2 +-
.../html/gst-plugins-ugly-plugins-plugin-asf.html | 2 +-
.../html/gst-plugins-ugly-plugins-plugin-cdio.html | 2 +-
...gst-plugins-ugly-plugins-plugin-dvdlpcmdec.html | 2 +-
.../gst-plugins-ugly-plugins-plugin-dvdread.html | 2 +-
.../gst-plugins-ugly-plugins-plugin-dvdsub.html | 2 +-
.../html/gst-plugins-ugly-plugins-plugin-lame.html | 2 +-
.../html/gst-plugins-ugly-plugins-plugin-mad.html | 2 +-
.../gst-plugins-ugly-plugins-plugin-mpeg2dec.html | 2 +-
.../gst-plugins-ugly-plugins-plugin-realmedia.html | 2 +-
.../gst-plugins-ugly-plugins-plugin-siddec.html | 2 +-
.../gst-plugins-ugly-plugins-plugin-twolame.html | 2 +-
.../html/gst-plugins-ugly-plugins-plugin-x264.html | 2 +-
docs/plugins/html/index.html | 2 +-
docs/plugins/inspect/plugin-a52dec.xml | 2 +-
docs/plugins/inspect/plugin-amrnb.xml | 2 +-
docs/plugins/inspect/plugin-amrwbdec.xml | 2 +-
docs/plugins/inspect/plugin-asf.xml | 2 +-
docs/plugins/inspect/plugin-cdio.xml | 2 +-
docs/plugins/inspect/plugin-dvdlpcmdec.xml | 2 +-
docs/plugins/inspect/plugin-dvdread.xml | 2 +-
docs/plugins/inspect/plugin-dvdsub.xml | 2 +-
docs/plugins/inspect/plugin-lame.xml | 2 +-
docs/plugins/inspect/plugin-mad.xml | 2 +-
docs/plugins/inspect/plugin-mpeg2dec.xml | 2 +-
docs/plugins/inspect/plugin-realmedia.xml | 2 +-
docs/plugins/inspect/plugin-siddec.xml | 2 +-
docs/plugins/inspect/plugin-twolame.xml | 2 +-
docs/plugins/inspect/plugin-x264.xml | 2 +-
docs/plugins/inspect/plugin-xingmux.xml | 2 +-
ext/x264/gstx264enc.c | 2 +-
gst-plugins-ugly.doap | 10 ++
gst-plugins-ugly.spec | 2 +-
po/af.gmo | Bin 530 -> 530 bytes
po/af.po | 2 +-
po/az.gmo | Bin 588 -> 588 bytes
po/az.po | 2 +-
po/bg.gmo | Bin 2666 -> 2666 bytes
po/bg.po | 2 +-
po/ca.gmo | Bin 2144 -> 2144 bytes
po/ca.po | 2 +-
po/cs.gmo | Bin 2374 -> 2374 bytes
po/cs.po | 2 +-
po/da.gmo | Bin 2156 -> 2156 bytes
po/da.po | 2 +-
po/de.gmo | Bin 2504 -> 2504 bytes
po/de.po | 2 +-
po/el.gmo | Bin 2876 -> 2876 bytes
po/el.po | 2 +-
po/en_GB.gmo | Bin 529 -> 529 bytes
po/en_GB.po | 2 +-
po/eo.gmo | Bin 2088 -> 2088 bytes
po/eo.po | 2 +-
po/es.gmo | Bin 2147 -> 2147 bytes
po/es.po | 2 +-
po/eu.gmo | Bin 1862 -> 1862 bytes
po/eu.po | 2 +-
po/fi.gmo | Bin 1776 -> 1776 bytes
po/fi.po | 2 +-
po/fr.gmo | Bin 2119 -> 2119 bytes
po/fr.po | 2 +-
po/gl.gmo | Bin 2416 -> 2416 bytes
po/gl.po | 2 +-
po/gst-plugins-ugly-1.0.pot | 4 +-
po/hr.gmo | Bin 2089 -> 2089 bytes
po/hr.po | 2 +-
po/hu.gmo | Bin 2326 -> 2326 bytes
po/hu.po | 2 +-
po/id.gmo | Bin 1959 -> 1959 bytes
po/id.po | 2 +-
po/it.gmo | Bin 1776 -> 1776 bytes
po/it.po | 2 +-
po/ja.gmo | Bin 2733 -> 2733 bytes
po/ja.po | 2 +-
po/lt.gmo | Bin 1332 -> 1332 bytes
po/lt.po | 2 +-
po/lv.gmo | Bin 2128 -> 2128 bytes
po/lv.po | 2 +-
po/ms.gmo | Bin 1701 -> 1701 bytes
po/ms.po | 2 +-
po/mt.gmo | Bin 1690 -> 1690 bytes
po/mt.po | 2 +-
po/nb.gmo | Bin 2194 -> 2194 bytes
po/nb.po | 2 +-
po/nl.gmo | Bin 2307 -> 2307 bytes
po/nl.po | 2 +-
po/or.gmo | Bin 604 -> 604 bytes
po/or.po | 2 +-
po/pl.gmo | Bin 2359 -> 2359 bytes
po/pl.po | 2 +-
po/pt_BR.gmo | Bin 2436 -> 2436 bytes
po/pt_BR.po | 2 +-
po/ro.gmo | Bin 1913 -> 1913 bytes
po/ro.po | 2 +-
po/ru.gmo | Bin 2863 -> 2863 bytes
po/ru.po | 2 +-
po/sk.gmo | Bin 1945 -> 1945 bytes
po/sk.po | 2 +-
po/sl.gmo | Bin 2288 -> 2288 bytes
po/sl.po | 2 +-
po/sq.gmo | Bin 538 -> 538 bytes
po/sq.po | 2 +-
po/sr.gmo | Bin 2670 -> 2670 bytes
po/sr.po | 2 +-
po/sv.gmo | Bin 1727 -> 1727 bytes
po/sv.po | 2 +-
po/tr.gmo | Bin 2248 -> 2248 bytes
po/tr.po | 2 +-
po/uk.gmo | Bin 3031 -> 3031 bytes
po/uk.po | 2 +-
po/vi.gmo | Bin 2573 -> 2573 bytes
po/vi.po | 2 +-
po/zh_CN.gmo | Bin 1878 -> 1878 bytes
po/zh_CN.po | 2 +-
tests/check/Makefile.in | 2 +
win32/common/config.h | 8 +-
130 files changed, 401 insertions(+), 143 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gstreamer/gst-plugins-ugly1.0.git
More information about the Pkg-gstreamer-commits
mailing list