[SCM] gmerlin-encoders/master.ubuntu: New changelog entry.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master.ubuntu branch:
commit 9a7b40b1d62353b1d6233e057fc5772614d4e337
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Jul 30 10:55:41 2011 +0200

    New changelog entry.

diff --git a/debian/changelog b/debian/changelog
index a2fe520..2712fd7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+gmerlin-encoders (1.0.0-3ubuntu1) oneiric; urgency=low
+
+  * Merge with Debian unstable:
+    - LAME encoder is now provided by gmerlin-encoders-good.
+    - Remaining changes:
+      + Build-Depends on libmjpegtool-dev.
+      + Add gmerlin-encoders-extra to provide more non-free encoders.
+
+ -- Alessio Treglia <quadrispro at ubuntu.com>  Sat, 30 Jul 2011 10:53:24 +0200
+
 gmerlin-encoders (1.0.0-3) unstable; urgency=low
 
   * Build-Depends on libmp3lame-dev.

-- 
gmerlin-encoders packaging