[SCM] mpv/master: Merge remote-tracking branch 'origin/experimental'

[siretart at users.alioth.debian.org]

add myself to uploaders
Rebuild against libav10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 90216f4f9d949695417098e82023e8e0ce855f95
X-Git-Newrev: eca5ccdd51d39688915892f35181b916f86aa138

The following commit has been merged in the master branch:
commit eca5ccdd51d39688915892f35181b916f86aa138
Merge: 90216f4f9d949695417098e82023e8e0ce855f95 bc8041033e9b3c40d2269d5db049e6ca00729e02
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun May 11 15:27:27 2014 -0400

    Merge remote-tracking branch 'origin/experimental'
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index b3928f2,0f9107b..c3085d6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,43 -1,9 +1,55 @@@
++mpv (0.3.9-2) unstable; urgency=low
++
++  * Merge branch experimental
++
++ -- Reinhard Tartler <siretart at tauware.de>  Sun, 11 May 2014 15:27:12 -0400
++
 +mpv (0.3.9-1) unstable; urgency=medium
 +
 +  * New upstream release
 +
 + -- Alessandro Ghedini <ghedo at debian.org>  Wed, 30 Apr 2014 13:28:31 +0200
 +
 +mpv (0.3.8-1) unstable; urgency=medium
 +
 +  * New upstream release
 +
 + -- Alessandro Ghedini <ghedo at debian.org>  Fri, 18 Apr 2014 10:56:21 +0200
 +
 +mpv (0.3.7-1) unstable; urgency=medium
 +
 +  * New upstream release
 +  * Enable all hardening options.
 +    Thanks to Simon Ruderich for the patch (Closes: #741439)
 +
 + -- Alessandro Ghedini <ghedo at debian.org>  Sun, 30 Mar 2014 20:00:42 +0200
 +
 +mpv (0.3.6-1) unstable; urgency=medium
 +
 +  * New upstream release
 +  * Update 03_waf.patch to newer waf version
 +
 + -- Alessandro Ghedini <ghedo at debian.org>  Tue, 11 Mar 2014 16:00:20 +0100
 +
 +mpv (0.3.5-1) unstable; urgency=medium
 +
 +  * New upstream release
 +
 + -- Alessandro Ghedini <ghedo at debian.org>  Wed, 12 Feb 2014 22:56:33 +0100
 +
 +mpv (0.3.4-1) unstable; urgency=medium
 +
 +  * New upstream release
 +  * Refresh patches
 +
 + -- Alessandro Ghedini <ghedo at debian.org>  Sat, 01 Feb 2014 12:20:29 +0100
 +
+ mpv (0.3.3-1+exp1) experimental; urgency=low
+ 
+   * Rebuild against libav10
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Fri, 17 Jan 2014 03:35:15 +0000
+ 
  mpv (0.3.3-1) unstable; urgency=medium
  
    * New upstream release

-- 
mpv packaging