[SCM] vlc/ubuntu: Changelog for VLC 1.1.4-1ubuntu1

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

The following commit has been merged in the ubuntu branch:
commit a039ce79b75c89128df0a830806d37fadadc1f2f
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Sun Sep 5 02:43:51 2010 +0200

    Changelog for VLC 1.1.4-1ubuntu1

diff --git a/debian/changelog b/debian/changelog
index 2cde985..987b953 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+vlc (1.1.4-1ubuntu1) maverick; urgency=low
+
+  * Merge from Debian experimental, remaining changes:
+    - build and install the libx264 plugin
+
+ -- Benjamin Drung <bdrung at ubuntu.com>  Sun, 05 Sep 2010 02:42:37 +0200
+
 vlc (1.1.4-1) experimental; urgency=low
 
   [ Christophe Mutricy ]

-- 
VLC media player packaging