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

[Sebastian Dröge]

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

slomo pushed a commit to branch master
in repository gst-libav1.0.

commit a1dd247dba92422f21dce7eca7b7d1ececf1e9e2
Merge: 33aa55d 7cb19d4
Author: Sebastian Dröge <slomo at circular-chaos.org>
Date:   Tue Sep 24 17:06:42 2013 +0200

    Merge tag 'upstream/1.2.0'
    
    Upstream version 1.2.0
    
    Conflicts:
    	ChangeLog
    	NEWS
    	configure
    	configure.ac
    	gst-libav.doap
    	gst-libav.spec

 ChangeLog                                  |   38 ++++++++-
 NEWS                                       |  123 +++++++++++++++++++++++++++-
 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                                  |   47 ++++++-----
 configure.ac                               |    8 +-
 gst-libav.doap                             |   10 +++
 gst-libav.spec                             |    2 +-
 tests/check/Makefile.in                    |    2 +
 12 files changed, 226 insertions(+), 43 deletions(-)

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