[SCM] gmerlin-avdecoder/master: dummy changelog

[zmoelnig-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit addafb1424f9393f9d48fc754d0e67d0bd2d4b23
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date:   Mon Jun 11 13:49:31 2012 +0200

    dummy changelog

diff --git a/debian/changelog b/debian/changelog
index b9cbcee..3e5f1de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-gmerlin-avdecoder (1.1.0~dfsg-4) UNRELEASED; urgency=low
+gmerlin-avdecoder (1.2.0~dfsg-2) UNRELEASED; urgency=low
 
   [ Alessio Treglia ]
   * Bump standards-version to 3.9.3.
@@ -31,7 +31,12 @@ gmerlin-avdecoder (1.1.0~dfsg-4) UNRELEASED; urgency=low
     + Relax build-depend unversioned on debhelper and devscripts: Needed
       versions satisfied even in oldstable.
 
- -- Jonas Smedegaard <dr at jones.dk>  Sun, 25 Mar 2012 19:24:23 +0200
+  [ IOhannes m zmölnig ]
+  * Imported Upstream version 1.2.0~dfsg
+  * Refreshed patches
+  * Removed libav-0.7 patch (no longer needed)
+
+ -- IOhannes m zmoelnig (gpg-key at iem) <zmoelnig at iem.at>  Mon, 11 Jun 2012 13:47:58 +0200
 
 gmerlin-avdecoder (1.1.0~dfsg-3) unstable; urgency=low
 

-- 
gmerlin-avdecoder packaging