[Pkg-gstreamer-commits] [gstreamer1.0] 04/05: Merge tag 'upstream/1.2.0'

Sebastian Dröge slomo at alioth.debian.org
Tue Sep 24 15:12:37 UTC 2013


This is an automated email from the git hooks/post-receive script.

slomo pushed a commit to branch master
in repository gstreamer1.0.

commit 7f484215b24fe2a99f36dc161a59e06a0a1fbfc3
Merge: bceeca2 2f89c9b
Author: Sebastian Dröge <slomo at circular-chaos.org>
Date:   Tue Sep 24 16:13:44 2013 +0200

    Merge tag 'upstream/1.2.0'
    
    Upstream version 1.2.0
    
    Conflicts:
    	ChangeLog
    	NEWS
    	RELEASE
    	configure
    	configure.ac
    	docs/gst/html/gstreamer-GstVersion.html
    	docs/gst/html/index.html
    	docs/libs/html/index.html
    	docs/plugins/html/gstreamer-plugins-plugin-coreelements.html
    	docs/plugins/html/index.html
    	docs/plugins/inspect/plugin-coreelements.xml
    	gstreamer.doap
    	gstreamer.spec
    	po/af.gmo
    	po/af.po
    	po/az.gmo
    	po/az.po
    	po/be.gmo
    	po/be.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/gstreamer-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/nb.gmo
    	po/nb.po
    	po/nl.gmo
    	po/nl.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/rw.gmo
    	po/rw.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
    	po/zh_TW.gmo
    	po/zh_TW.po
    	win32/common/config.h
    	win32/common/gstversion.h

 ChangeLog                                          |  195 +++++++++++++++++++-
 NEWS                                               |  123 +++++++++++-
 RELEASE                                            |   25 +--
 autogen.sh                                         |   12 +-
 common/check.mak                                   |    6 +-
 common/extract-release-date-from-doap-file         |    8 +-
 common/m4/gst-args.m4                              |    9 +-
 common/m4/gst-glib2.m4                             |   12 +-
 common/m4/gst-package-release-datetime.m4          |    4 +-
 configure                                          |   57 +++---
 configure.ac                                       |    4 +-
 docs/gst/html/annotation-glossary.html             |   79 ++++----
 docs/gst/html/api-index-full.html                  |    8 +-
 docs/gst/html/gstreamer-GstVersion.html            |    4 +-
 docs/gst/html/index.html                           |    2 +-
 docs/gst/html/index.sgml                           |   22 +--
 docs/libs/html/annotation-glossary.html            |   64 +++----
 docs/libs/html/api-index-full.html                 |    4 +-
 docs/libs/html/index.html                          |    2 +-
 docs/libs/html/index.sgml                          |   18 +-
 .../gstreamer-plugins-plugin-coreelements.html     |    2 +-
 docs/plugins/html/index.html                       |    2 +-
 docs/plugins/inspect/plugin-coreelements.xml       |    2 +-
 gst/gstbin.c                                       |    2 +-
 gst/gstcontext.c                                   |    6 +-
 gstreamer.doap                                     |   10 +
 gstreamer.spec                                     |    2 +-
 libs/gst/base/gstcollectpads.c                     |    6 +-
 libs/gst/check/gsttestclock.c                      |   72 ++++++--
 po/af.gmo                                          |  Bin 15086 -> 15086 bytes
 po/af.po                                           |    2 +-
 po/az.gmo                                          |  Bin 1683 -> 1683 bytes
 po/az.po                                           |    2 +-
 po/be.gmo                                          |  Bin 5090 -> 5090 bytes
 po/be.po                                           |    2 +-
 po/bg.gmo                                          |  Bin 43541 -> 43541 bytes
 po/bg.po                                           |    2 +-
 po/ca.gmo                                          |  Bin 33891 -> 33891 bytes
 po/ca.po                                           |    2 +-
 po/cs.gmo                                          |  Bin 36524 -> 36524 bytes
 po/cs.po                                           |    2 +-
 po/da.gmo                                          |  Bin 32162 -> 32162 bytes
 po/da.po                                           |    2 +-
 po/de.gmo                                          |  Bin 35739 -> 35739 bytes
 po/de.po                                           |    2 +-
 po/el.gmo                                          |  Bin 44236 -> 44236 bytes
 po/el.po                                           |    2 +-
 po/en_GB.gmo                                       |  Bin 11570 -> 11570 bytes
 po/en_GB.po                                        |    2 +-
 po/eo.gmo                                          |  Bin 4307 -> 4307 bytes
 po/eo.po                                           |    2 +-
 po/es.gmo                                          |  Bin 34074 -> 34074 bytes
 po/es.po                                           |    2 +-
 po/eu.gmo                                          |  Bin 29611 -> 29611 bytes
 po/eu.po                                           |    2 +-
 po/fi.gmo                                          |  Bin 32606 -> 32606 bytes
 po/fi.po                                           |    2 +-
 po/fr.gmo                                          |  Bin 35949 -> 35949 bytes
 po/fr.po                                           |    2 +-
 po/gl.gmo                                          |  Bin 35588 -> 35588 bytes
 po/gl.po                                           |    2 +-
 po/gstreamer-1.0.pot                               |    4 +-
 po/hr.gmo                                          |  Bin 31756 -> 31756 bytes
 po/hr.po                                           |    2 +-
 po/hu.gmo                                          |  Bin 35621 -> 35621 bytes
 po/hu.po                                           |    2 +-
 po/id.gmo                                          |  Bin 31904 -> 31904 bytes
 po/id.po                                           |    2 +-
 po/it.gmo                                          |  Bin 33706 -> 33706 bytes
 po/it.po                                           |    2 +-
 po/ja.gmo                                          |  Bin 16417 -> 16417 bytes
 po/ja.po                                           |    2 +-
 po/lt.gmo                                          |  Bin 31450 -> 31450 bytes
 po/lt.po                                           |    2 +-
 po/nb.gmo                                          |  Bin 9881 -> 9881 bytes
 po/nb.po                                           |    2 +-
 po/nl.gmo                                          |  Bin 35743 -> 35743 bytes
 po/nl.po                                           |    2 +-
 po/pl.gmo                                          |  Bin 36088 -> 36088 bytes
 po/pl.po                                           |    2 +-
 po/pt_BR.gmo                                       |  Bin 35589 -> 35589 bytes
 po/pt_BR.po                                        |    2 +-
 po/ro.gmo                                          |  Bin 32820 -> 32820 bytes
 po/ro.po                                           |    2 +-
 po/ru.gmo                                          |  Bin 46520 -> 46520 bytes
 po/ru.po                                           |    2 +-
 po/rw.gmo                                          |  Bin 689 -> 689 bytes
 po/rw.po                                           |    2 +-
 po/sk.gmo                                          |  Bin 33078 -> 33078 bytes
 po/sk.po                                           |    2 +-
 po/sl.gmo                                          |  Bin 34227 -> 34227 bytes
 po/sl.po                                           |    2 +-
 po/sq.gmo                                          |  Bin 12731 -> 12731 bytes
 po/sq.po                                           |    2 +-
 po/sr.gmo                                          |  Bin 42372 -> 42372 bytes
 po/sr.po                                           |    2 +-
 po/sv.gmo                                          |  Bin 32473 -> 32473 bytes
 po/sv.po                                           |    2 +-
 po/tr.gmo                                          |  Bin 12104 -> 12104 bytes
 po/tr.po                                           |    2 +-
 po/uk.gmo                                          |  Bin 47299 -> 47299 bytes
 po/uk.po                                           |    2 +-
 po/vi.gmo                                          |  Bin 39788 -> 39788 bytes
 po/vi.po                                           |    2 +-
 po/zh_CN.gmo                                       |  Bin 25530 -> 25530 bytes
 po/zh_CN.po                                        |    2 +-
 po/zh_TW.gmo                                       |  Bin 7285 -> 7285 bytes
 po/zh_TW.po                                        |    2 +-
 scripts/gst-uninstalled                            |   35 ++--
 tests/check/Makefile.in                            |    2 +
 tests/check/gst/gstcontext.c                       |   37 ++++
 tests/check/libs/gsttestclock.c                    |    5 +
 win32/common/config.h                              |    8 +-
 win32/common/gstversion.h                          |    4 +-
 114 files changed, 686 insertions(+), 249 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gstreamer/gstreamer1.0.git



More information about the Pkg-gstreamer-commits mailing list