[SCM] x264/ubuntu: update debian/changelog

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 5f3754b2af8ce2b2a79d72bdf56947ae21edc127
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Oct 31 19:54:43 2011 +0100

    update debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 3e4e850..4e054b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+x264 (2:0.118.2092+git6eac7c3-1ubuntu1) precise; urgency=low
+
+  * Merge from Debian, remaining changes:
+    - build against libgpac-dev to enable .mp4 output
+
+ -- Reinhard Tartler <siretart at tauware.de>  Mon, 31 Oct 2011 19:54:37 +0100
+
 x264 (2:0.118.2092+git6eac7c3-1) unstable; urgency=low
 
   [ Rico Tzschichholz ]

-- 
x264 packaging